valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-06 09:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove errors when converting empty numeric rows (#6371)

Browse Source
This commit is contained in:
Breakwell 2020-04-08 23:59:19 +01:00 committed by GitHub
parent dcca9f1124
commit b35d968876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osquery/sql/dynamic_table_row.cpp
View File

@ -108,11 +108,16 @@ int DynamicTableRow::get_column(sqlite3_context* ctx,
} else if (type == TEXT_TYPE || type == BLOB_TYPE) {
sqlite3_result_text(
ctx, value.c_str(), static_cast<int>(value.size()), SQLITE_TRANSIENT);
} else if (value.empty() &&
(type == INTEGER_TYPE || type == BIGINT_TYPE ||
type == UNSIGNED_BIGINT_TYPE || type == DOUBLE_TYPE)) {
// Don't Log a casting error for a known type if the column row is empty
sqlite3_result_null(ctx);
} else if (type == INTEGER_TYPE) {
auto afinite = tryTo<long>(value, 0);
if (afinite.isError()) {
VLOG(1) << "Error casting " << column_name << " (" << value
<< ") to INTEGER";
<< ") to INTEGER. " << afinite.getError();
sqlite3_result_null(ctx);
} else {
sqlite3_result_int(ctx, afinite.take());
@ -121,7 +126,7 @@ int DynamicTableRow::get_column(sqlite3_context* ctx,
auto afinite = tryTo<long long>(value, 0);
if (afinite.isError()) {
VLOG(1) << "Error casting " << column_name << " (" << value
<< ") to BIGINT";
<< ") to BIGINT. " << afinite.getError();
sqlite3_result_null(ctx);
} else {
sqlite3_result_int64(ctx, afinite.take());