archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  fix test
  fix NULL deref
This commit is contained in:
Anatol Belski 2017-08-01 12:02:16 +02:00
commit f30506c8ff
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/exif/exif.c
View file

@ -1973,11 +1973,11 @@ static void exif_error_docref(const char *docref EXIFERR_DC, const image_info_ty
char *buf; char *buf;
spprintf(&buf, 0, "%s(%d): %s", _file, _line, format); spprintf(&buf, 0, "%s(%d): %s", _file, _line, format);
php_verror(docref, ImageInfo->FileName?ImageInfo->FileName:"", type, buf, args); php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, buf, args);
efree(buf); efree(buf);
} }
#else #else
php_verror(docref, ImageInfo->FileName?ImageInfo->FileName:"", type, format, args); php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, format, args);
#endif #endif
va_end(args); va_end(args);
} }

2
ext/exif/tests/bug73115/bug73115.phpt
View file

@ -7,7 +7,7 @@ output_handler=
zlib.output_compression=0 zlib.output_compression=0
--FILE-- --FILE--
<?php <?php
$infile = dirname(__FILE__).'/bug73115.JPG'; $infile = dirname(__FILE__).'/bug73115.jpg';
var_dump(count(exif_read_data($infile))); var_dump(count(exif_read_data($infile)));
?> ?>
===DONE=== ===DONE===