TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use std::span to bound read_model_file valid bytes

Browse source
This commit is contained in:
Kp 2022-08-22 01:24:49 +00:00
parent 42caec7e58
commit 15e8ceeaa4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/main/polyobj.cpp
View file

@ -159,16 +159,15 @@ static polymodel *read_model_file(polymodel *pm,const char *filename,robot_info
{
short version;
int len, next_chunk;
ubyte model_buf[MODEL_BUF_SIZE];
auto &&[ifile, physfserr] = PHYSFSX_openReadBuffered(filename);
if (!ifile)
Error("Failed to open file <%s>: %s", filename, PHYSFS_getErrorByCode(physfserr));
Assert(PHYSFS_fileLength(ifile) <= MODEL_BUF_SIZE);
Pof_addr = 0;
Pof_file_end = PHYSFS_read(ifile, model_buf, 1, PHYSFS_fileLength(ifile));
std::array<uint8_t, MODEL_BUF_SIZE> model_storage;
Pof_file_end = PHYSFS_read(ifile, model_storage.data(), 1, model_storage.size());
const std::span model_buf{model_storage.data(), Pof_file_end};
ifile.reset();
const int model_id = pof_read_int(model_buf);