valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-08 02:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #430 from theopolis/fix-biging

Browse Source 
Check tables row vector size before access
This commit is contained in:
Teddy Reed 2014-11-14 15:25:39 -08:00
commit 0cb30d8ccb
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osquery/tables/templates/default.cpp.in
View File

@ -72,26 +72,28 @@ int {{table_name_cc}}Column(
{% for col in schema %}\
// {{ col.name }}
case {{ loop.index0 }}:
if (pVtab->pContent->xCol_{{col.name}}.size() > pCur->row) {
{% if col.type.affinity == "TEXT" %}\
sqlite3_result_text(
ctx,
(pVtab->pContent->xCol_{{col.name}}[pCur->row]).c_str(),
-1,
nullptr
);
sqlite3_result_text(
ctx,
(pVtab->pContent->xCol_{{col.name}}[pCur->row]).c_str(),
-1,
nullptr
);
{% endif %}\
{% if col.type.affinity == "INTEGER" %}\
sqlite3_result_int(
ctx,
({{col.type.type}})pVtab->pContent->xCol_{{col.name}}[pCur->row]
);
sqlite3_result_int(
ctx,
({{col.type.type}})pVtab->pContent->xCol_{{col.name}}[pCur->row]
);
{% endif %}\
{% if col.type.affinity == "BIGINT" %}\
sqlite3_result_int64(
ctx,
({{col.type.type}})pVtab->pContent->xCol_{{col.name}}[pCur->row]
);
sqlite3_result_int64(
ctx,
({{col.type.type}})pVtab->pContent->xCol_{{col.name}}[pCur->row]
);
{% endif %}\
}
break;
{% endfor %}\
}
@ -134,7 +136,7 @@ int {{table_name_cc}}Filter(
pVtab->pContent->xCol_{{col.name}}.push_back(-1);
}
{% endif %}\
{% if col.type == "BIGINT" %}\
{% if col.type.affinity == "BIGINT" %}\
try {
pVtab->pContent->xCol_{{col.name}}\
.push_back(boost::lexical_cast<{{col.type.type}}>(row["{{col.name}}"]));