[[ Bug 22346 ]] Fix abort on error when query contains format specifier

montegoulding · montegoulding · commit 379129ed5246 · 2019-09-02T15:08:59.000+10:00
This patch ensures that where an error is thrown that may include the query
string which itself may include a valid sprintf format specifier the error
string is passed as an argument rather than the format string. This resolves
either a crash or error message containing garbage.
diff --git a/libsqlite/src/sqlitedataset.cpp b/libsqlite/src/sqlitedataset.cpp
@@ -409,10 +409,10 @@ int SqliteDatabase::connect(bool p_use_uri)
   {
     char* err=NULL;
     if (setErr(sqlite3_exec(getHandle(),"PRAGMA empty_result_callbacks=ON",NULL,NULL,&err),"PRAGMA empty_result_callbacks=ON") != SQLITE_OK)
-      throw DbErrors(getErrorMsg());
+      throw DbErrors("%s", getErrorMsg());
 
 	if (setErr(sqlite3_exec(getHandle(),"PRAGMA SHOW_DATATYPES=ON",NULL,NULL,&err),"PRAGMA SHOW_DATATYPES=ON") != SQLITE_OK)
-      throw DbErrors(getErrorMsg());
+      throw DbErrors("%s", getErrorMsg());
 
 	//load any  collations
 #ifdef CUSTOM_COLLATION
@@ -435,7 +435,7 @@ int SqliteDatabase::connect(bool p_use_uri)
           sqlite3_close(conn);
           conn = nullptr;
       }
-	  throw DbErrors(getErrorMsg());
+	  throw DbErrors("%s", getErrorMsg());
   }
 
   return DB_CONNECTION_NONE;
@@ -558,7 +558,7 @@ void SqliteDataset::make_query(StringList &_sql) {
 	char* err=NULL; 
 	Dataset::parse_sql(query);
 	if (db->setErr(sqlite3_exec(this->handle(),query.c_str(),NULL,NULL,&err),query.c_str())!=SQLITE_OK) {
-	  throw DbErrors(db->getErrorMsg());
+	  throw DbErrors("%s", db->getErrorMsg());
 	}
   } // end of for
 
@@ -889,7 +889,7 @@ int SqliteDataset::exec(const string &sql) {
     return res;
   else
     {
-      throw DbErrors(db->getErrorMsg());
+      throw DbErrors("%s", db->getErrorMsg());
     }
 }
 
@@ -935,7 +935,7 @@ bool SqliteDataset::query(const char *query)
 		if (t_query_result == SQLITE_ERROR)
 			db -> setErrDirect(errmsg);
 		
-		throw DbErrors(db->getErrorMsg());
+		throw DbErrors("%s", db->getErrorMsg());
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -409,10 +409,10 @@ int SqliteDatabase::connect(bool p_use_uri)`
`409`	`409`	`{`
`410`	`410`	`char* err=NULL;`
`411`	`411`	`if (setErr(sqlite3_exec(getHandle(),"PRAGMA empty_result_callbacks=ON",NULL,NULL,&err),"PRAGMA empty_result_callbacks=ON") != SQLITE_OK)`
`412`		`- throw DbErrors(getErrorMsg());`
	`412`	`+ throw DbErrors("%s", getErrorMsg());`
`413`	`413`
`414`	`414`	`if (setErr(sqlite3_exec(getHandle(),"PRAGMA SHOW_DATATYPES=ON",NULL,NULL,&err),"PRAGMA SHOW_DATATYPES=ON") != SQLITE_OK)`
`415`		`- throw DbErrors(getErrorMsg());`
	`415`	`+ throw DbErrors("%s", getErrorMsg());`
`416`	`416`
`417`	`417`	`//load any collations`
`418`	`418`	`#ifdef CUSTOM_COLLATION`
`@@ -435,7 +435,7 @@ int SqliteDatabase::connect(bool p_use_uri)`
`435`	`435`	`sqlite3_close(conn);`
`436`	`436`	`conn = nullptr;`
`437`	`437`	`}`
`438`		`- throw DbErrors(getErrorMsg());`
	`438`	`+ throw DbErrors("%s", getErrorMsg());`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`return DB_CONNECTION_NONE;`
`@@ -558,7 +558,7 @@ void SqliteDataset::make_query(StringList &_sql) {`
`558`	`558`	`char* err=NULL;`
`559`	`559`	`Dataset::parse_sql(query);`
`560`	`560`	`if (db->setErr(sqlite3_exec(this->handle(),query.c_str(),NULL,NULL,&err),query.c_str())!=SQLITE_OK) {`
`561`		`- throw DbErrors(db->getErrorMsg());`
	`561`	`+ throw DbErrors("%s", db->getErrorMsg());`
`562`	`562`	`}`
`563`	`563`	`} // end of for`
`564`	`564`
`@@ -889,7 +889,7 @@ int SqliteDataset::exec(const string &sql) {`
`889`	`889`	`return res;`
`890`	`890`	`else`
`891`	`891`	`{`
`892`		`- throw DbErrors(db->getErrorMsg());`
	`892`	`+ throw DbErrors("%s", db->getErrorMsg());`
`893`	`893`	`}`
`894`	`894`	`}`
`895`	`895`
`@@ -935,7 +935,7 @@ bool SqliteDataset::query(const char *query)`
`935`	`935`	`if (t_query_result == SQLITE_ERROR)`
`936`	`936`	`db -> setErrDirect(errmsg);`
`937`	`937`
`938`		`- throw DbErrors(db->getErrorMsg());`
	`938`	`+ throw DbErrors("%s", db->getErrorMsg());`
`939`	`939`	`}`
`940`	`940`	`}`
`941`	`941`