Resync

Author: inactive123

formats/png/rpng.c

@@ -955,19 +955,8 @@ static bool read_chunk_header(uint8_t *buf, uint8_t *buf_end,
       struct png_chunk *chunk)
 {
    unsigned i;
-   uint8_t dword[4];
 
-   dword[0] = '\0';
-
-   /* 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);
+   chunk->size = dword_be(buf);
 
    /* Check whether chunk will overflow the data buffer */
    if (buf + 8 + chunk->size > buf_end)
@@ -1019,6 +1008,10 @@ 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;