sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault when adding a layer

Browse Source
This commit is contained in:
Blottiere Paul 2020-06-02 16:33:49 +02:00 committed by Nyall Dawson
parent 9fec5262b0
commit 07eca3e670
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgssqliteutils.cpp
View File

@ -126,7 +126,7 @@ QSet<QString> QgsSqliteUtils::uniqueFields( sqlite3 *connection, const QString &
QSet<QString> uniqueFieldsResults; QSet<QString> uniqueFieldsResults;
char *zErrMsg = 0; char *zErrMsg = 0;
std::vector<std::string> rows; std::vector<std::string> rows;
QString sql = sqlite3_mprintf( "select sql from sqlite_master where type='table' and name=%q", quotedIdentifier( tableName ).toStdString().c_str() ); QString sql = QgsSqlite3Mprintf( "select sql from sqlite_master where type='table' and name=%q", quotedIdentifier( tableName ).toStdString().c_str() );
auto cb = [ ]( auto cb = [ ](
void *data /* Data provided in the 4th argument of sqlite3_exec() */, void *data /* Data provided in the 4th argument of sqlite3_exec() */,
int /* The number of columns in row */, int /* The number of columns in row */,
@ -171,7 +171,7 @@ QSet<QString> QgsSqliteUtils::uniqueFields( sqlite3 *connection, const QString &
rows.clear(); rows.clear();
// Search indexes: // Search indexes:
sql = sqlite3_mprintf( "SELECT sql FROM sqlite_master WHERE type='index' AND" sql = QgsSqlite3Mprintf( "SELECT sql FROM sqlite_master WHERE type='index' AND"
" tbl_name='%q' AND sql LIKE 'CREATE UNIQUE INDEX%%'" ); " tbl_name='%q' AND sql LIKE 'CREATE UNIQUE INDEX%%'" );
rc = sqlite3_exec( connection, sql.toUtf8(), cb, ( void * )&rows, &zErrMsg ); rc = sqlite3_exec( connection, sql.toUtf8(), cb, ( void * )&rows, &zErrMsg );
if ( rc != SQLITE_OK ) if ( rc != SQLITE_OK )