christoph/fail
1
Fork 0
Code Releases Activity

import-trace: fix SQL value list termination

Browse Source 
This fixes the (never intendedly occurring) case that no comma is
found in the SQL value list, and aligns the termination code with the
comment next to it.  Found by Coverity Scan, CID 25653.

Change-Id: I98062748458a50603cd63a9017acd94eef0753f9
This commit is contained in:
Horst Schirmeier
2015-02-07 15:58:23 +01:00
parent 8e5cd0d632
commit 41a191eeaa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/import-trace/Importer.cc
View File

@ -428,9 +428,16 @@ bool Importer::add_trace_event(margin_info_t &begin, margin_info_t &end,
return false;
}
// replace trailing ",\s*$" with ")"
// replace trailing ",[^,]*$" with ")"
std::string value_sql_str = value_sql.str();
value_sql_str[value_sql_str.find_last_of(',')] = ')';
size_t comma_pos = value_sql_str.find_last_of(',');
if (comma_pos == std::string::npos) {
// should never happen
comma_pos = value_sql_str.length();
LOG << "internal error: no comma found in SQL value list" << std::endl;
}
value_sql_str.resize(comma_pos + 1);
value_sql_str[comma_pos] = ')';
if (!db->insert_multiple(insert_sql->c_str(), value_sql_str.c_str())) {
LOG << "Database::insert_multiple() failed" << std::endl;