matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some memory leaks in save build/parse

Browse Source
This commit is contained in:
jacksonmj 2011-04-14 18:34:25 +01:00 committed by Simon
parent d6a28b6427
commit 24808344f4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@ -477,9 +477,11 @@ void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRE
{ {
free(d); free(d);
free(c); free(c);
free(m);
return NULL; return NULL;
} }
free(d); free(d);
free(m);
*size = i+12; *size = i+12;
return c; return c;
@ -487,8 +489,8 @@ void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRE
int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr, unsigned pmap[YRES][XRES]) int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr, unsigned pmap[YRES][XRES])
{ {
unsigned char *d,*c=save; unsigned char *d=NULL,*c=save;
int q,i,j,k,x,y,p=0,*m=calloc(XRES*YRES, sizeof(int)), ver, pty, ty, legacy_beta=0; int q,i,j,k,x,y,p=0,*m=NULL, ver, pty, ty, legacy_beta=0;
int bx0=x0/CELL, by0=y0/CELL, bw, bh, w, h; int bx0=x0/CELL, by0=y0/CELL, bw, bh, w, h;
int fp[NPART], nf=0, new_format = 0, ttv = 0; int fp[NPART], nf=0, new_format = 0, ttv = 0;
particle *parts = partsptr; particle *parts = partsptr;
@ -573,6 +575,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
} }
clear_sim(); clear_sim();
} }
m = calloc(XRES*YRES, sizeof(int));
// make a catalog of free parts // make a catalog of free parts
memset(pmap, 0, sizeof(pmap)); memset(pmap, 0, sizeof(pmap));
@ -897,11 +900,14 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
} }
version1: version1:
free(d); if (m) free(m);
if (d) free(d);
return 0; return 0;
corrupt: corrupt:
if (m) free(m);
if (d) free(d);
if (replace) if (replace)
{ {
legacy_enable = 0; legacy_enable = 0;