zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a memory leak in CON_RESIZEARRAY. This commit also includes an inconsequential dozen or so lines of formatting changes I had done when I stumbled across the bug.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5839 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-08-27 01:42:19 +00:00
parent 3f4a4679ce
commit bf41fc91b0
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
polymer/eduke32/source/gameexec.c
View file

@ -4009,10 +4009,10 @@ finish_qsprintf:
{ {
tw = *insptr++; tw = *insptr++;
int const labelNum = *insptr++; int const labelNum = *insptr++;
int const lVar2 = *insptr++; int const lVar2 = *insptr++;
int const sectNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : sprite[vm.spriteNum].sectnum; int const sectNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : sprite[vm.spriteNum].sectnum;
int32_t const nValue = Gv_GetVarX(lVar2); int const nValue = Gv_GetVarX(lVar2);
VM_SetSector(sectNum, labelNum, nValue); VM_SetSector(sectNum, labelNum, nValue);
continue; continue;
@ -4424,9 +4424,9 @@ finish_qsprintf:
case CON_GETPLAYERVAR: case CON_GETPLAYERVAR:
insptr++; insptr++;
{ {
int const playerNum = (*insptr++ != g_thisActorVarID) ? Gv_GetVarX(*(insptr-1)) : vm.playerNum; int const playerNum = (*insptr++ != g_thisActorVarID) ? Gv_GetVarX(*(insptr - 1)) : vm.playerNum;
int const lVar1 = *insptr++; int const lVar1 = *insptr++;
int const lVar2 = *insptr++; int const lVar2 = *insptr++;
if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers)) if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers))
{ {
@ -4454,9 +4454,9 @@ finish_qsprintf:
{ {
tw = *insptr++; tw = *insptr++;
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum; int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
int const labelNum = *insptr++; int const labelNum = *insptr++;
int const lParm2 = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0; int const lParm2 = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0;
VM_SetSprite(spriteNum, labelNum, lParm2, Gv_GetVarX(*insptr++)); VM_SetSprite(spriteNum, labelNum, lParm2, Gv_GetVarX(*insptr++));
continue; continue;
@ -4467,9 +4467,9 @@ finish_qsprintf:
{ {
tw = *insptr++; tw = *insptr++;
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum; int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
int const labelNum = *insptr++; int const labelNum = *insptr++;
int const lParm2 = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0; int const lParm2 = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0;
Gv_SetVarX(*insptr++, VM_GetSprite(spriteNum, labelNum, lParm2)); Gv_SetVarX(*insptr++, VM_GetSprite(spriteNum, labelNum, lParm2));
continue; continue;
@ -4480,8 +4480,8 @@ finish_qsprintf:
{ {
tw = *insptr++; tw = *insptr++;
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum; int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
int const labelNum = *insptr++; int const labelNum = *insptr++;
VM_SetTsprite(spriteNum, labelNum, Gv_GetVarX(*insptr++)); VM_SetTsprite(spriteNum, labelNum, Gv_GetVarX(*insptr++));
continue; continue;
@ -4492,8 +4492,8 @@ finish_qsprintf:
{ {
tw = *insptr++; tw = *insptr++;
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum; int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
int const labelNum = *insptr++; int const labelNum = *insptr++;
Gv_SetVarX(*insptr++, VM_GetTsprite(spriteNum, labelNum)); Gv_SetVarX(*insptr++, VM_GetTsprite(spriteNum, labelNum));
continue; continue;
@ -4707,10 +4707,10 @@ finish_qsprintf:
// OSD_Printf(OSDTEXT_GREEN "CON_RESIZEARRAY: resizing array %s from %d to %d\n", // OSD_Printf(OSDTEXT_GREEN "CON_RESIZEARRAY: resizing array %s from %d to %d\n",
// aGameArrays[j].szLabel, aGameArrays[j].size, newSize); // aGameArrays[j].szLabel, aGameArrays[j].size, newSize);
intptr_t * const tmpar = oldSize != 0 ? (intptr_t *)Xmalloc(GAR_ELTSZ * oldSize) : NULL; intptr_t * const pArray = oldSize != 0 ? (intptr_t *)Xmalloc(GAR_ELTSZ * oldSize) : NULL;
if (oldSize != 0) if (oldSize != 0)
memcpy(tmpar, aGameArrays[tw].pValues, GAR_ELTSZ * oldSize); Bmemcpy(pArray, aGameArrays[tw].pValues, GAR_ELTSZ * oldSize);
Baligned_free(aGameArrays[tw].pValues); Baligned_free(aGameArrays[tw].pValues);
@ -4718,10 +4718,12 @@ finish_qsprintf:
aGameArrays[tw].size = newSize; aGameArrays[tw].size = newSize;
if (oldSize != 0) if (oldSize != 0)
memcpy(aGameArrays[tw].pValues, tmpar, GAR_ELTSZ * min(oldSize, newSize)); Bmemcpy(aGameArrays[tw].pValues, pArray, GAR_ELTSZ * min(oldSize, newSize));
if (newSize > oldSize) if (newSize > oldSize)
memset(&aGameArrays[tw].pValues[oldSize], 0, GAR_ELTSZ * (newSize - oldSize)); Bmemset(&aGameArrays[tw].pValues[oldSize], 0, GAR_ELTSZ * (newSize - oldSize));
Bfree(pArray);
} }
continue; continue;
} }