From 99e9bc0863a847f3423194358d42fdbc01f4ce18 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 25 Apr 2013 09:09:04 -0700 Subject: [PATCH] Fix 'getStr' to not crash on a non-existent column. --- src/cpp/database/SqliteDatabase.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cpp/database/SqliteDatabase.cpp b/src/cpp/database/SqliteDatabase.cpp index b74fe4c6e..c921449d7 100644 --- a/src/cpp/database/SqliteDatabase.cpp +++ b/src/cpp/database/SqliteDatabase.cpp @@ -179,8 +179,9 @@ bool SqliteDatabase::getNull(int colIndex) char* SqliteDatabase::getStr(int colIndex,std::string& retStr) { - retStr=(char*)sqlite3_column_text(mCurrentStmt, colIndex); - return((char*)retStr.c_str()); + const char *text = reinterpret_cast(sqlite3_column_text(mCurrentStmt, colIndex)); + retStr = (text == NULL) ? "" : text; + return const_cast(retStr.c_str()); } int32 SqliteDatabase::getInt(int colIndex)