Merge lp:~hexmode/ubuntu/lucid/php5/php5.fix-php-bug-33210 into lp:ubuntu/lucid-proposed/php5

[Mark A. Hershberger]

Fix for https://bugs.launchpad.net/ubuntu/+source/php5/+bug/922650

[Clint Byrum (clint-fewbar)]

Hi Mark, thanks for the quick patch effort.

Just two quick things.

1. This patch needs documentation in the "DEP3" format:

http://dep.debian.net/deps/dep3/

At the very minimum, it needs an Origin: header and a link to the Ubuntu and PHP bugs. Adding your name/email would be nice, but is not 100% required for such a small patch.

This is necessary so that the patch, as its own unit, is readable and traceable as the package evolves over time.

2. Please run 'dch -i' and add a changelog entry. I'll have to port it forward as the lp:ubuntu/lucid-proposed/php5 branch is out of date, but its important that we have your changelog entry. It should explain in human readable terms what the bug it fixes is, and include a launchpad bug reference in the format of (LP: #922650). This will also make sure that you receive proper credit when the fix is uploaded. The version number should be 5.3.2-1ubuntu4.12 , and the pocket should be 'lucid-proposed' (instead of lucid, or lucid-security).

So close!

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Oh and make sure to change the status back to 'Needs Review' when you have pushed up your changes so it appears on the sponsorship queue again.

Unmerged revisions

67. By Mark A. Hershberger on 2012-01-27

fix for PHP Bug#33210

=== added file 'debian/patches/fix-bug-33210.patch'
--- debian/patches/fix-bug-33210.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-bug-33210.patch	2012-01-27 22:12:29 +0000
@@ -0,0 +1,16 @@
+--- a/ext/standard/image.c	2010/06/30 11:28:42	300880
++++ b/ext/standard/image.c	2010/06/30 12:21:35	300881
+@@ -402,12 +402,7 @@
+ 				last_marker = M_PSEUDO; /* stop skipping non 0xff for M_COM */
+ 			}
+ 		}
+-		if (++a > 25)
+-		{
+-			/* who knows the maxim amount of 0xff? though 7 */
+-			/* but found other implementations              */
+-			return M_EOI;
+-		}
++		a++;
+ 	} while (marker == 0xff);
+ 	if (a < 2)
+ 	{

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-16 11:50:19 +0000
+++ debian/patches/series	2012-01-27 22:12:29 +0000
@@ -55,3 +55,4 @@
 fix-mysql-badmem.patch
 session_save_path.patch
 lp564920-fix-big-files.patch
+fix-bug-33210.patch