Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix code analysis stuff

Browse Source
This commit is contained in:
momo5502 2016-10-30 15:24:07 +01:00
parent 58a92c10f7
commit f48bb934ac
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Modules/Materials.cpp
View File

@ -101,8 +101,8 @@ namespace Components
void Materials::DumpImageCfgPath(int, const char*, const char* material) void Materials::DumpImageCfgPath(int, const char*, const char* material)
{ {
FILE* fp; FILE* fp = nullptr;
if (!fopen_s(&fp, "dump.cfg", "a")) if (!fopen_s(&fp, "dump.cfg", "a") && fp != nullptr)
{ {
fprintf(fp, "dumpraw %s\n", material); fprintf(fp, "dumpraw %s\n", material);
fclose(fp); fclose(fp);

26
src/Components/Modules/Zones.cpp
View File

@ -851,19 +851,23 @@ namespace Components
Game::DB_PopStreamPos(); Game::DB_PopStreamPos();
} }
// Code-analysis has a bug, the first memcpy makes it believe size of tempVar is 44 instead of 84
#pragma warning(push)
#pragma warning(disable: 6385)
bool Zones::LoadGameWorldSp(bool atStreamStart, char* buffer) bool Zones::LoadGameWorldSp(bool atStreamStart, char* buffer)
{ {
bool result = Game::Load_Stream(atStreamStart, buffer, 84); bool result = Game::Load_Stream(atStreamStart, buffer, 84);
Game::GameWorldSp world[2]; static char tempVar[84];
std::memcpy(&world, buffer, 44); std::memcpy(&tempVar[0], &buffer[0], 44);
std::memcpy(&world[1], &buffer[44], 28); std::memcpy(&tempVar[56], &buffer[44], 28);
std::memcpy(&world->vehicleTrack, &buffer[72], 12); std::memcpy(&tempVar[44], &buffer[72], 12);
std::memcpy(buffer, world, 84); std::memcpy(buffer, tempVar, sizeof(tempVar));
return result; return result;
} }
#pragma warning(pop)
void Zones::LoadPathDataTail() void Zones::LoadPathDataTail()
{ {
@ -927,20 +931,24 @@ namespace Components
return result; return result;
} }
// Code-analysis has a bug, the first memcpy makes it believe size of tempVar is 400 instead of 788
#pragma warning(push)
#pragma warning(disable: 6385)
bool Zones::LoadVehicleDef(bool atStreamStart, char* buffer) bool Zones::LoadVehicleDef(bool atStreamStart, char* buffer)
{ {
bool result = Game::Load_Stream(atStreamStart, buffer, 788); bool result = Game::Load_Stream(atStreamStart, buffer, 788);
Game::VehicleDef vehicle[2]; static char tempVar[788];
std::memcpy(vehicle, &buffer[0], 400); std::memcpy(&tempVar[0], &buffer[0], 400);
std::memcpy(&vehicle->pad[404], &buffer[400], 388); std::memcpy(&tempVar[408], &buffer[400], 388);
AssetHandler::Relocate(buffer + 400, buffer + 408, 388); AssetHandler::Relocate(buffer + 400, buffer + 408, 388);
std::memcpy(buffer, vehicle, 788); std::memmove(buffer, tempVar, sizeof(tempVar));
return result; return result;
} }
#pragma warning(pop)
void Zones::LoadWeaponAttachStuff(DWORD* varWeaponAttachStuff, int count) void Zones::LoadWeaponAttachStuff(DWORD* varWeaponAttachStuff, int count)
{ {