Skip to content

Commit dcd9f03

Browse files
committed
Replaced memcpy wth strncpy in zone name loading
1 parent 34b4f93 commit dcd9f03

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ModelVariations/Peds.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ void PedVariations::LoadData()
208208
if (!vec.empty())
209209
{
210210
pedVars->pedHasVariations.insert(modelIndex);
211-
uint64_t zoneName;
212-
memcpy(&zoneName, kvp.first.c_str(), 8);
211+
uint64_t zoneName = 0;
212+
strncpy((char*)&zoneName, kvp.first.c_str(), 8);
213213
pedVars->variations[zoneName][modelIndex] = mergeZones ? vectorUnion(pedVars->variations[zoneName][modelIndex], vec) : vec;
214214
}
215215
}

ModelVariations/Vehicles.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ void VehicleVariations::LoadData()
542542
{
543543
if (isupper(kvp.first[1]))
544544
{
545-
uint64_t zoneName;
546-
memcpy(&zoneName, kvp.first.c_str(), 8);
545+
uint64_t zoneName = 0;
546+
strncpy((char*)&zoneName, kvp.first.c_str(), 8);
547547

548548
auto vec = dataFile.ReadLine(section, kvp.first, READ_VEHICLES);
549549
if (!vec.empty())

0 commit comments

Comments
 (0)