From 2fcb79e2de5b17716294304e494ac99e883c6e64 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 29 Jun 2020 00:10:37 +0200 Subject: Core/DataStores: Fixed loading db2 strings Closes #24916 --- src/server/shared/DataStores/DB2Store.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/shared/DataStores/DB2Store.cpp b/src/server/shared/DataStores/DB2Store.cpp index 0c99462ec5d..f7ec9ab2473 100644 --- a/src/server/shared/DataStores/DB2Store.cpp +++ b/src/server/shared/DataStores/DB2Store.cpp @@ -98,11 +98,12 @@ bool DB2StorageBase::Load(std::string const& path, LocaleConstant locale, char** // load raw non-string data _dataTable = db2.AutoProduceData(_indexTableSize, indexTable, _stringPool); + if (!_dataTable) + return false; // load strings from db2 data - if (!_stringPool.empty()) - if (char* stringBlock = db2.AutoProduceStrings(indexTable, _indexTableSize, locale)) - _stringPool.push_back(stringBlock); + if (char* stringBlock = db2.AutoProduceStrings(indexTable, _indexTableSize, locale)) + _stringPool.push_back(stringBlock); db2.AutoProduceRecordCopies(_indexTableSize, indexTable, _dataTable); -- cgit v1.2.3