quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an invalid pointer reference in the alphahack image loader, print filename on LoadJPGBuff error messages.

Browse Source
This commit is contained in:
Stijn Buys 2013-07-02 19:23:35 +02:00
parent 847a61d888
commit 2f72e166b2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/quake3/q3map2/image.c
View File

@ -402,7 +402,8 @@ image_t *ImageLoad( const char *filename ){
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 ); size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
if ( size > 0 ) { if ( size > 0 ) {
if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) { if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) {
Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); // On error, LoadJPGBuff might store a pointer to the error message in image->pixels
Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) image->pixels );
} }
alphaHack = qtrue; alphaHack = qtrue;
} }
@ -460,15 +461,19 @@ image_t *ImageLoad( const char *filename ){
if ( size > 0 ) { if ( size > 0 ) {
unsigned char *pixels; unsigned char *pixels;
int width, height; int width, height;
if ( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 && pixels != NULL ) { if ( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 ) {
Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); if (pixels) {
// On error, LoadJPGBuff might store a pointer to the error message in pixels
Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) pixels );
}
} else {
if ( width == image->width && height == image->height ) {
int i;
for ( i = 0; i < width * height; ++i )
image->pixels[4 * i + 3] = pixels[4 * i + 2]; // copy alpha from blue channel
}
free( pixels );
} }
if ( pixels && width == image->width && height == image->height ) {
int i;
for ( i = 0; i < width * height; ++i )
image->pixels[4 * i + 3] = pixels[4 * i + 2]; // copy alpha from blue channel
}
free( pixels );
free( buffer ); free( buffer );
} }
} }