ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpng: delete "unused" png_chunk member 

also fix a rather ugly buffer overflow that relies on the unused member existing and being null
This commit is contained in:
Alcaro 2020-08-16 00:27:25 +02:00 committed by GitHub
parent 982fbadd15
commit 37efa9d52e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretro-common/formats/png/rpng.c
View File

@ -84,7 +84,6 @@ struct png_chunk
{ {
uint32_t size; uint32_t size;
char type[4]; char type[4];
uint8_t *data;
}; };
struct rpng_process struct rpng_process
@ -153,7 +152,7 @@ static enum png_chunk_type png_chunk_type(char chunk_type[4])
for (i = 0; i < ARRAY_SIZE(chunk_map); i++) for (i = 0; i < ARRAY_SIZE(chunk_map); i++)
{ {
if (string_is_equal(chunk_type, chunk_map[i].id)) if (!memcmp(chunk_type, chunk_map[i].id, 4))
return chunk_map[i].type; return chunk_map[i].type;
} }
@ -1015,7 +1014,6 @@ bool rpng_iterate_image(rpng_t *rpng)
chunk.size = 0; chunk.size = 0;
chunk.type[0] = 0; chunk.type[0] = 0;
chunk.data = NULL;
/* Check whether data buffer pointer is valid */ /* Check whether data buffer pointer is valid */
if (buf > rpng->buff_end) if (buf > rpng->buff_end)