ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BiosTools: Bounds check strings in LoadBiosVersion()

This commit is contained in:
Connor McLaughlin 2022-03-31 21:14:17 +10:00 committed by refractionpcsx2
parent 4f70fd9583
commit 50452848e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/ps2/BiosTools.cpp
View File

@ -16,6 +16,7 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include <cstdio> #include <cstdio>
#include <cstring>
#include "common/FileSystem.h" #include "common/FileSystem.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
@ -58,15 +59,13 @@ BiosDebugInformation CurrentBiosInformation;
static bool LoadBiosVersion(std::FILE* fp, u32& version, std::string& description, u32& region, std::string& zone) static bool LoadBiosVersion(std::FILE* fp, u32& version, std::string& description, u32& region, std::string& zone)
{ {
uint i;
romdir rd; romdir rd;
for (u32 i = 0; i < 512 * 1024; i++)
for (i = 0; i < 512 * 1024; i++)
{ {
if (std::fread(&rd, sizeof(rd), 1, fp) != 1) if (std::fread(&rd, sizeof(rd), 1, fp) != 1)
return false; return false;
if (std::strncmp(rd.fileName, "RESET", 5) == 0) if (std::strncmp(rd.fileName, "RESET", sizeof(rd.fileName)) == 0)
break; /* found romdir */ break; /* found romdir */
} }
@ -74,9 +73,10 @@ static bool LoadBiosVersion(std::FILE* fp, u32& version, std::string& descriptio
s64 fileSize = FileSystem::FSize64(fp); s64 fileSize = FileSystem::FSize64(fp);
bool foundRomVer = false; bool foundRomVer = false;
while (strlen(rd.fileName) > 0) // ensure it's a null-terminated and not zero-length string
while (rd.fileName[0] != '\0' && strnlen(rd.fileName, sizeof(rd.fileName)) != sizeof(rd.fileName))
{ {
if (strcmp(rd.fileName, "ROMVER") == 0) if (std::strncmp(rd.fileName, "ROMVER", sizeof(rd.fileName)) == 0)
{ {
char romver[14 + 1] = {}; // ascii version loaded from disk. char romver[14 + 1] = {}; // ascii version loaded from disk.