libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Fixed code analysis warnings (bug #3087917)

Browse Source 
svn-id: r54964
This commit is contained in:
Filippos Karapetis 2010-12-19 16:16:25 +00:00
parent 5e9002a4aa
commit cc0b2b210f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/font.cpp
View File

@ -224,6 +224,11 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) {
warning("Error: EOF on file");
return 0;
}
/* note: the way sscanf is used here ensures that a terminating null
character is automatically added. Refer to:
http://pubs.opengroup.org/onlinepubs/009695399/functions/fscanf.html */
if (isprefix(buf, "FONT ")) { /* not required*/
if (sscanf(buf, "FONT %[^\n]", facename) != 1) {
warning("Error: bad 'FONT'");
@ -506,7 +511,11 @@ int bdf_read_bitmaps(Common::SeekableReadStream &fp, NewFontData* pf) {
/* reallocate bits array to actual bits used*/
if (ofs < pf->bits_size) {
pf->bits = (bitmap_t *)realloc(pf->bits, ofs * sizeof(bitmap_t));
bitmap_t *tmp = (bitmap_t *)realloc(pf->bits, ofs * sizeof(bitmap_t));
if (tmp != NULL || ofs == 0)
pf->bits = tmp;
else
error("bdf_read_bitmaps: Error while reallocating memory");
pf->bits_size = ofs;
}
else {