duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-07-02 15:52:19 +01:00
commit 4a8877713e
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/TextScr.cpp
View file

@ -169,6 +169,13 @@ BOOL LoadTextScript_Stage(const char *name)
if (head_size == -1) if (head_size == -1)
return FALSE; return FALSE;
#ifdef FIX_BUGS
// The original doesn't check for any kind of buffer overflow here, so feeding in a 1 MiB Head.tsc
// (assuming an unchanged TSC_BUFFER_SIZE) would be sure to crash the game, for example.
if (head_size > TSC_BUFFER_SIZE)
return FALSE;
#endif
fp = fopen(path.c_str(), "rb"); fp = fopen(path.c_str(), "rb");
if (fp == NULL) if (fp == NULL)
return FALSE; return FALSE;
@ -186,6 +193,12 @@ BOOL LoadTextScript_Stage(const char *name)
if (body_size == -1) if (body_size == -1)
return FALSE; return FALSE;
#ifdef FIX_BUGS
// Same as above: the original doesn't bother checking, and may crash on large-enough input
if (head_size + body_size > TSC_BUFFER_SIZE)
return FALSE;
#endif
fp = fopen(path.c_str(), "rb"); fp = fopen(path.c_str(), "rb");
if (fp == NULL) if (fp == NULL)
return FALSE; return FALSE;