From: Nikita Popov <nikic@php.net>
Date: Thu, 5 Jan 2017 10:38:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.1RC1~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2022dacb9997df2391866df99eb1592a1527fc27;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

2022dacb9997df2391866df99eb1592a1527fc27
diff --cc ext/exif/exif.c
index a0ad5e7896,3663b3f226..ca0190754f
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@@ -2844,7 -2855,7 +2844,7 @@@ static int exif_process_IFD_TAG(image_i
  	}
  
  	if (components < 0) {
- 		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
 -		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), components);
++		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
  		return FALSE;
  	}