mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Fix bug #81265: getimagesize returns 0 for 256px ICO images
This commit is contained in:
Nikita Popov 2021-07-16 10:07:35 +02:00
commit f2e374c881
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/standard/image.c
View File

@ -1099,6 +1099,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;
}
/* }}} */

BIN
ext/standard/tests/image/32x256.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

26
ext/standard/tests/image/getimagesize_256_ico.phpt Normal file
View File

@ -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===