diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-04-19 22:30:43 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-04-19 22:30:43 -0400 |
| commit | 094918f048c81474b22f9ba2940c96dc4033d753 (patch) | |
| tree | 2b89c77ad7dc9c55e9ba383f23f9f25b82df358e /SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp | |
| parent | 640fff60ceecde402131937dddb3458f7a003e9c (diff) | |
| parent | a308f430f694423064ebc86fd0506c8c6fdb3d93 (diff) | |
Merge tag 'upstream/3.0.5'
Upstream version 3.0.5
# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp index d31d536..676009a 100644 --- a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp @@ -929,10 +929,10 @@ void DbVersionConverter::fullConvertStep2() for (DbPlugin* plugin : PLUGINS->getLoadedPlugins<DbPlugin>()) { tmpDb = plugin->getInstance("", ":memory:", QHash<QString,QVariant>()); - if (tmpDb->initAfterCreated() && tmpDb->getDialect() == fullConversionConfig->to) + if (tmpDb && tmpDb->initAfterCreated() && tmpDb->getDialect() == fullConversionConfig->to) db = plugin->getInstance(fullConversionConfig->targetName, fullConversionConfig->targetFile, QHash<QString,QVariant>()); - delete tmpDb; + safe_delete(tmpDb); if (db) break; } @@ -1105,7 +1105,7 @@ QList<Db*> DbVersionConverter::getAllPossibleDbInstances() const for (DbPlugin* plugin : PLUGINS->getLoadedPlugins<DbPlugin>()) { db = plugin->getInstance("", ":memory:", QHash<QString,QVariant>()); - if (!db->initAfterCreated()) + if (!db || !db->initAfterCreated()) continue; dbList << db; |