SqliteTools: Fix potential crash with empty string columns

3c019a2b · Hugo Beauzée-Luyssen · 421dd7c4 · 3c019a2b
Commit 3c019a2b authored May 22, 2014 by Hugo Beauzée-Luyssen
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/SqliteTools.h src/SqliteTools.h +5 -2

No files found.
--- a/src/SqliteTools.h
+++ b/src/SqliteTools.h
@@ -31,9 +31,12 @@ struct Traits<std::string>
        return sqlite3_bind_text( stmt, pos, tmp, -1, free );
    }

-    static const char* Load( sqlite3_stmt* stmt, int pos )
+    static std::string Load( sqlite3_stmt* stmt, int pos )
    {
-        return (const char*)sqlite3_column_text( stmt, pos );
+        auto tmp = (const char*)sqlite3_column_text( stmt, pos );
+        if ( tmp != nullptr )
+            return std::string( tmp );
+        return std::string();
    }
 };