Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DataStores: Fixed string fields containing empty strings in some 10.0.5 db2 files

Browse Source 
Closes #28805
This commit is contained in:
Shauren
2023-02-03 23:41:31 +01:00
parent 65adaf8c43
commit 01965086ef
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/DataStores/DB2FileLoader.cpp
View File

@@ -575,13 +575,19 @@ char* DB2FileLoaderRegularImpl::AutoProduceStrings(char** indexTable, uint32 ind
break;
case FT_STRING:
{
((LocalizedString*)(&recordData[offset]))->Str[locale] = stringPool + (RecordGetString(rawRecord, x, z) - (char const*)_stringTable);
char const* string = RecordGetString(rawRecord, x, z);
if (string >= reinterpret_cast<char const*>(_stringTable)) // ensure string is inside _stringTable
reinterpret_cast<LocalizedString*>(&recordData[offset])->Str[locale] = stringPool + (string - reinterpret_cast<char const*>(_stringTable));
offset += sizeof(LocalizedString);
break;
}
case FT_STRING_NOT_LOCALIZED:
{
*((char**)(&recordData[offset])) = stringPool + (RecordGetString(rawRecord, x, z) - (char const*)_stringTable);
char const* string = RecordGetString(rawRecord, x, z);
if (string >= reinterpret_cast<char const*>(_stringTable)) // ensure string is inside _stringTable
*reinterpret_cast<char**>(&recordData[offset]) = stringPool + (string - reinterpret_cast<char const*>(_stringTable));
offset += sizeof(char*);
break;
}