clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source 
* PHP-7.1:
  Fix #71848: getimagesize with $imageinfo returns false
This commit is contained in:
Christoph M. Becker 2018-06-30 16:32:19 +02:00
commit e2285eb542
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -41,6 +41,7 @@ PHP NEWS
- Standard:
. Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys).
(Laruence)
. Fixed bug #71848 (getimagesize with $imageinfo returns false). (cmb)
- ZIP:
. Fixed bug #76461 (OPSYS_Z_CPM defined instead of OPSYS_CPM).

2
ext/standard/image.c
View File

@ -453,7 +453,7 @@ static int php_read_APP(php_stream * stream, unsigned int marker, zval *info)
buffer = emalloc(length);
if (php_stream_read(stream, buffer, (zend_long) length) <= 0) {
if (php_stream_read(stream, buffer, (zend_long) length) != length) {
efree(buffer);
return 0;
}

BIN
ext/standard/tests/image/bug71848.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 699 B

32
ext/standard/tests/image/bug71848.phpt Normal file
View File

@ -0,0 +1,32 @@
--TEST--
Bug #71848 (getimagesize with $imageinfo returns false)
--FILE--
<?php
var_dump(getimagesize(__DIR__ . '/bug71848.jpg', $info));
var_dump(array_keys($info));
?>
===DONE===
--EXPECT--
array(7) {
[0]=>
int(8)
[1]=>
int(8)
[2]=>
int(2)
[3]=>
string(20) "width="8" height="8""
["bits"]=>
int(8)
["channels"]=>
int(3)
["mime"]=>
string(10) "image/jpeg"
}
array(2) {
[0]=>
string(4) "APP0"
[1]=>
string(4) "APP5"
}
===DONE===