]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jul 2018 22:13:13 +0000 (15:13 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jul 2018 22:13:13 +0000 (15:13 -0700)
* PHP-5.6:
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c

1  2 
ext/exif/exif.c

diff --cc ext/exif/exif.c
index 064487b1f49acf98fba3554eccbc92153bf923d3,cad29b729548e4206f0697710cc9e177f26fdff3..6fa60f7a2a20e6daf6b0447f73f279469b26d20f
@@@ -2797,7 -2814,7 +2803,7 @@@ static int exif_process_IFD_in_MAKERNOT
  
        for (de=0;de<NumDirEntries;de++) {
                if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
-                                                                 offset_base, IFDlength, displacement, section_index, 0, maker_note->tag_table)) {
 -                                                                offset_base, data_len, displacement, section_index, 0, maker_note->tag_table TSRMLS_CC)) {
++                                                                offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {
                        return FALSE;
                }
        }