stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix memory leak

Browse source
This commit is contained in:
Jaime Passos 2020-05-15 15:43:40 -03:00
parent 1a677a341f
commit a9035f6abc
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/r_textures.c
View file

@ -505,7 +505,7 @@ UINT8 *R_GenerateTexture(size_t texnum)
block = Z_Malloc(blocksize+1, PU_STATIC, &texturecache[texnum]); block = Z_Malloc(blocksize+1, PU_STATIC, &texturecache[texnum]);
if (format == PICFMT_PATCH32) if (format == PICFMT_PATCH32)
memset(block, 0x00000000, blocksize+1); memset(block, 0x00, blocksize+1);
else else
memset(block, TRANSPARENTPIXEL, blocksize+1); // Transparency hack memset(block, TRANSPARENTPIXEL, blocksize+1); // Transparency hack
@ -560,10 +560,18 @@ UINT8 *R_GenerateTexture(size_t texnum)
x2 = x1 + width; x2 = x1 + width;
if (x1 > texture->width || x2 < 0) if (x1 > texture->width || x2 < 0)
{
if (dealloc)
Z_Free(realpatch);
continue; // patch not located within texture's x bounds, ignore continue; // patch not located within texture's x bounds, ignore
}
if (patch->originy > texture->height || (patch->originy + height) < 0) if (patch->originy > texture->height || (patch->originy + height) < 0)
{
if (dealloc)
Z_Free(realpatch);
continue; // patch not located within texture's y bounds, ignore continue; // patch not located within texture's y bounds, ignore
}
// patch is actually inside the texture! // patch is actually inside the texture!
// now check if texture is partly off-screen and adjust accordingly // now check if texture is partly off-screen and adjust accordingly