]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 14 Jun 2016 17:50:45 +0000 (10:50 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Jun 2016 17:50:45 +0000 (10:50 -0700)
* PHP-5.6:
  Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream

1  2 
ext/exif/exif.c

diff --cc ext/exif/exif.c
Simple merge