Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: GCC warning "variable might be clobbered by longjmp"

Browse source
This commit is contained in:
kervala 2016-11-29 20:28:19 +01:00
parent f1f15f59eb
commit 7242de6856
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
code/nel/src/misc/bitmap_png.cpp
View file

@ -91,7 +91,7 @@ uint8 CBitmap::readPNG( NLMISC::IStream &f )
// free all of the memory associated with the png_ptr and info_ptr // free all of the memory associated with the png_ptr and info_ptr
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
// if we get here, we had a problem reading the file // if we get here, we had a problem reading the file
nlwarning("failed to setjump"); nlwarning("Error while reading PNG");
return 0; return 0;
} }
@ -241,6 +241,21 @@ uint8 CBitmap::readPNG( NLMISC::IStream &f )
return imageDepth; return imageDepth;
} }
// small helper to avoid local variables
static bool writePNGSetJmp(png_struct *png_ptr)
{
if (setjmp(png_jmpbuf(png_ptr)))
{
// free all of the memory associated with the png_ptr
png_destroy_write_struct(&png_ptr, (png_info**)NULL);
// if we get here, we had a problem writing the file
nlwarning("Error while writing PNG");
return false;
}
return true;
}
/*-------------------------------------------------------------------*\ /*-------------------------------------------------------------------*\
writePNG writePNG
\*-------------------------------------------------------------------*/ \*-------------------------------------------------------------------*/
@ -274,12 +289,7 @@ bool CBitmap::writePNG( NLMISC::IStream &f, uint32 d)
return false; return false;
} }
if (setjmp(png_jmpbuf(png_ptr))) if (!writePNGSetJmp(png_ptr)) return false;
{
png_destroy_write_struct( &png_ptr, (png_info**)NULL );
nlwarning("couldn't set setjmp");
return false;
}
// set the write function // set the write function
png_set_write_fn(png_ptr, (void*)&f, writePNGData, NULL); png_set_write_fn(png_ptr, (void*)&f, writePNGData, NULL);