OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progs/util: Fix memory leak if LoadRGBImage fails.

Browse Source 
(cherry picked from commit 041cd0e110)
This commit is contained in:
Vinson Lee
2009-11-17 10:11:50 -08:00
parent 84de1672d3
commit f1172c4030
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
progs/util/readtex.c
View File

@@ -357,6 +357,7 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
fprintf(stderr, fprintf(stderr,
"Error in LoadRGBImage %d-component images not implemented\n", "Error in LoadRGBImage %d-component images not implemented\n",
image->components ); image->components );
FreeImage(image);
return NULL; return NULL;
} }
@@ -365,8 +366,10 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
bytes = image->sizeX * image->sizeY * image->components; bytes = image->sizeX * image->sizeY * image->components;
buffer = (GLubyte *) malloc(bytes); buffer = (GLubyte *) malloc(bytes);
if (!buffer) if (!buffer) {
FreeImage(image);
return NULL; return NULL;
}
memcpy( (void *) buffer, (void *) image->data, bytes ); memcpy( (void *) buffer, (void *) image->data, bytes );