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

Fix leaks when a query fails from the shell (#6849)

Browse Source
This commit is contained in:
Stefano Bonicatti 2020-12-26 22:09:53 +01:00 committed by GitHub
parent 2c0791276e
commit 2f8e7d9725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osquery/devtools/shell.cpp
View File

@ -379,7 +379,6 @@ struct callback_data {
char nullvalue[20]; /* The text to print when a NULL comes back from
** the database */
char outfile[FILENAME_MAX]; /* Filename for *out */
char* zFreeOnClose; /* Filename to free when closing */
sqlite3_stmt* pStmt; /* Current statement if any. */
FILE* pLog; /* Write log output here */
int* aiIndent; /* Array of indents used in MODE_Explain */
@ -1686,6 +1685,7 @@ int runQuery(struct callback_data* data, const char* query) {
if (error != nullptr) {
fprintf(stderr, "Error: %s\n", error);
rc = (rc == 0) ? 1 : rc;
sqlite3_free(error);
} else if (rc != 0) {
fprintf(stderr, "Error: unable to process SQL \"%s\"\n", query);
}
@ -1771,6 +1771,9 @@ int launchIntoShell(int argc, char** argv) {
} else {
rc = runQuery(&data, query);
if (rc != 0) {
if (data.prettyPrint != nullptr) {
delete data.prettyPrint;
}
return rc;
}
}
@ -1802,7 +1805,6 @@ int launchIntoShell(int argc, char** argv) {
}
set_table_name(&data, nullptr);
sqlite3_free(data.zFreeOnClose);
if (data.prettyPrint != nullptr) {
delete data.prettyPrint;