Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix bug #81265: getimagesize returns 0 for 256px ICO images

Author: nikic

NEWS

@@ -10,6 +10,8 @@ PHP                                                                        NEWS
 
 - Standard:
   . Fixed bug #72146 (Integer overflow on substr_replace). (cmb)
+  . Fixed bug #81265 (getimagesize returns 0 for 256px ICO images).
+    (George Dietrich)
 
 29 Jul 2021, PHP 8.0.9
 

ext/standard/image.c

@@ -1098,6 +1098,12 @@ static struct gfxinfo *php_handle_ico(php_stream * stream)
 		num_icons--;
 	}
 
+	if (0 == result->width)
+		result->width = 256;
+
+	if (0 == result->height)
+		result->height = 256;
+
 	return result;
 }
 /* }}} */

ext/standard/tests/image/32x256.ico

@@ -0,0 +1,26 @@
+--TEST--
+GetImageSize() for ico format with 256px height
+--FILE--
+<?php
+echo "*** Testing getimagesize() : 256px ico ***\n";
+var_dump(getimagesize(__DIR__ . "/32x256.ico"));
+
+?>
+===DONE===
+--EXPECT--
+*** Testing getimagesize() : 256px ico ***
+array(6) {
+  [0]=>
+  int(32)
+  [1]=>
+  int(256)
+  [2]=>
+  int(17)
+  [3]=>
+  string(23) "width="32" height="256""
+  ["bits"]=>
+  int(8)
+  ["mime"]=>
+  string(24) "image/vnd.microsoft.icon"
+}
+===DONE===