zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix stack corruption when demo was attempted to be written with non-empty mod dir.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2960 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-24 18:52:55 +00:00
parent 1f5971a4db
commit a8af22ba9a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
polymer/eduke32/source/demo.c
View file

@ -130,7 +130,7 @@ extern int32_t krd_print(const char *filename);
void G_OpenDemoWrite(void) void G_OpenDemoWrite(void)
{ {
char d[14]; char d[BMAX_PATH];
int32_t i, demonum=1; int32_t i, demonum=1;
if (ud.recstat == 2) if (ud.recstat == 2)
@ -168,11 +168,20 @@ void G_OpenDemoWrite(void)
do do
{ {
int32_t nch;
if (demonum == 10000) return; if (demonum == 10000) return;
if (g_modDir[0] != '/') if (g_modDir[0] != '/')
Bsprintf(d,"%s/edemo%d.edm",g_modDir, demonum++); nch=Bsnprintf(d, sizeof(d), "%s/edemo%d.edm", g_modDir, demonum++);
else Bsprintf(d, "edemo%d.edm", demonum++); else nch=Bsnprintf(d, sizeof(d), "edemo%d.edm", demonum++);
if ((unsigned)nch >= sizeof(d)-1)
{
// TODO: factor out this out and use everywhere else.
initprintf("Couldn't start demo writing: INTERNAL ERROR: file name too long\n");
goto error_wopen_demo;
}
g_demo_filePtr = Bfopen(d, "rb"); g_demo_filePtr = Bfopen(d, "rb");
if (g_demo_filePtr == NULL) break; if (g_demo_filePtr == NULL) break;
@ -186,9 +195,10 @@ void G_OpenDemoWrite(void)
demorec_synccompress_cvar|(demorec_seeds_cvar<<1)); demorec_synccompress_cvar|(demorec_seeds_cvar<<1));
if (i) if (i)
{ {
Bfclose(g_demo_filePtr), g_demo_filePtr=NULL;
error_wopen_demo:
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "FAILED STARTING DEMO RECORDING. SEE OSD FOR DETAILS."); Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "FAILED STARTING DEMO RECORDING. SEE OSD FOR DETAILS.");
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps); P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
Bfclose(g_demo_filePtr), g_demo_filePtr=NULL;
ud.recstat = ud.m_recstat = 0; ud.recstat = ud.m_recstat = 0;
return; return;
} }