From: Christoph M. Becker <cmb@php.net>
Date: Sat, 18 Jul 2015 20:52:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta2~6^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ed0d1815280758b63d221d8de8b1ff6e24cc890;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70096: Repeated iptcembed() adds superfluous FF bytes

Conflicts:
	ext/standard/iptc.c
---

3ed0d1815280758b63d221d8de8b1ff6e24cc890
diff --cc ext/standard/iptc.c
index 4554be32db,169ee96d35..c47f2c2133
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@@ -237,8 -235,9 +237,9 @@@ PHP_FUNCTION(iptcembed
  		switch (marker) {
  			case M_APP13:
  				/* we are going to write a new APP13 marker, so don't output the old one */
 -				php_iptc_skip_variable(fp, 0, 0 TSRMLS_CC);    
 +				php_iptc_skip_variable(fp, 0, 0);
+ 				fgetc(fp); /* skip already copied 0xFF byte */
 -				php_iptc_read_remaining(fp, spool, poi?&poi:0 TSRMLS_CC);
 +				php_iptc_read_remaining(fp, spool, poi?&poi:0);
  				done = 1;
  				break;