]> granicus.if.org Git - php/commitdiff
Fix false positive for -Wtype-limits in standard image ext
authorGeorge Peter Banyard <girgias@php.net>
Wed, 5 Feb 2020 17:10:09 +0000 (18:10 +0100)
committerGeorge Peter Banyard <girgias@php.net>
Wed, 5 Feb 2020 17:10:09 +0000 (18:10 +0100)
ext/standard/image.c

index f4d93d3f773baeeb5541fcd4701617eabcb67868..e7bc509e912304912dc08af142de87b00ade3457 100644 (file)
@@ -436,7 +436,7 @@ static int php_skip_variable(php_stream * stream)
  */
 static int php_read_APP(php_stream * stream, unsigned int marker, zval *info)
 {
-       unsigned short length;
+       size_t length;
        char *buffer;
        char markername[16];
        zval *tmp;
@@ -447,7 +447,7 @@ static int php_read_APP(php_stream * stream, unsigned int marker, zval *info)
        }
        length -= 2;                            /* length includes itself */
 
-       buffer = emalloc((size_t)length);
+       buffer = emalloc(length);
 
        if (php_stream_read(stream, buffer, (size_t) length) != length) {
                efree(buffer);