m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure pointers are put back to NULL when freed.

Browse Source 
--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    trunk/palette.c
M    trunk/init.c
M    trunk/engine.c
M    trunk/filesel.c
M    trunk/miscfileformats.c
M    trunk/pages.c
M    trunk/brush_ops.c
M    trunk/op_c.c
M    trunk/operatio.c
M    trunk/brush.c
M    trunk/loadsave.c
M    trunk/graph.c
M    trunk/fileformats.c
M    trunk/main.c


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1277 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues
2010-01-18 14:26:59 +00:00
parent 04d7359ef5
commit b36dee613e
14 changed files with 74 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fileformats.c
View File

@@ -125,6 +125,7 @@ void Load_IMG(T_IO_Context * context)
}
free(buffer);
buffer = NULL;
}
else
File_error=1;
@@ -642,6 +643,7 @@ void Load_LBM(T_IO_Context * context)
File_error=2;
}
free(LBM_buffer);
LBM_buffer = NULL;
}
else
{ // compressé
@@ -684,6 +686,7 @@ void Load_LBM(T_IO_Context * context)
}
free(LBM_buffer);
LBM_buffer = NULL;
/*Close_lecture();*/
}
}
@@ -703,6 +706,7 @@ void Load_LBM(T_IO_Context * context)
File_error=2;
}
free(LBM_buffer);
LBM_buffer = NULL;
}
else
{ // compressé
@@ -1200,6 +1204,7 @@ void Load_BMP(T_IO_Context * context)
File_error=2;
}
free(buffer);
buffer = NULL;
break;
case 1 : // Compression RLE 8 bits
@@ -1418,6 +1423,7 @@ void Load_BMP(T_IO_Context * context)
}
free(buffer);
buffer = NULL;
fclose(file);
}
}
@@ -2020,6 +2026,7 @@ void Load_GIF(T_IO_Context * context)
free(alphabet_suffix);
free(alphabet_prefix);
free(alphabet_stack);
alphabet_suffix = alphabet_prefix = alphabet_stack = NULL;
} // Le fichier contenait au moins la signature GIF87a ou GIF89a
else
File_error=1;
@@ -2759,6 +2766,7 @@ void Load_PCX(T_IO_Context * context)
}
free(LBM_buffer);
LBM_buffer = NULL;
}
}
}
@@ -2834,6 +2842,7 @@ void Load_PCX(T_IO_Context * context)
/*Close_lecture();*/
}
free(buffer);
buffer = NULL;
}
}
}
@@ -3086,6 +3095,7 @@ void Load_SCx(T_IO_Context * context)
}
}
free(LBM_buffer);
LBM_buffer = NULL;
}
else
File_error=1;
@@ -3376,6 +3386,7 @@ void Load_PNG(T_IO_Context * context)
context->Palette[x].B=palette[x].blue;
}
free(palette);
palette = NULL;
}
if (color_type != PNG_COLOR_TYPE_RGB && color_type != PNG_COLOR_TYPE_RGB_ALPHA)
@@ -3452,10 +3463,14 @@ void Load_PNG(T_IO_Context * context)
/* cleanup heap allocation */
if (row_pointers_allocated)
{
for (y=0; y<context->Height; y++)
for (y=0; y<context->Height; y++) {
free(Row_pointers[y]);
Row_pointers[y] = NULL;
}
}
free(Row_pointers);
Row_pointers = NULL;
}
else
File_error=2;