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

Revert "Optimize read_chunk_header" 

This reverts commit 33f9ef90d8.
This commit is contained in:
twinaphex 2020-08-19 18:15:54 +02:00
parent 282d34aeb1
commit ea5d134337
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,15 +947,16 @@ static bool read_chunk_header(uint8_t *buf, uint8_t *buf_end,
{
unsigned i;
uint8_t dword[4];
uint8_t *dword_ptr = NULL;
uint8_t *buf_ptr = NULL;
dword[0] = '\0';
dword[0] = '\0';
for ( dword_ptr = &dword[0], buf_ptr = &buf[0]
; dword_ptr < dword + 4
; dword_ptr++, buf_ptr++)
*dword_ptr = *buf_ptr;
/* Check whether reading the header will overflow
* the data buffer */
if (buf_end - buf < 8)
return false;
for (i = 0; i < 4; i++)
dword[i] = buf[i];
chunk->size = dword_be(dword);
@ -1009,10 +1010,6 @@ bool rpng_iterate_image(rpng_t *rpng)
if (buf > rpng->buff_end)
return false;
/* Check whether reading the header will overflow
* the data buffer */
if (rpng->buff_end - buf < 8)
return false;
if (!read_chunk_header(buf, rpng->buff_end, &chunk))
return false;