[Pkg-php-commits] r1222 - in php5/trunk/debian: . patches patches/gentoo

[Sean Finney]

Author: seanius
Date: 2009-01-18 19:25:33 +0000 (Sun, 18 Jan 2009)
New Revision: 1222

Removed:
   php5/trunk/debian/patches/gentoo/014_explode-overflow.patch
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
remove one gentoo patch already fixed in a CVE patch

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2009-01-18 18:41:58 UTC (rev 1221)
+++ php5/trunk/debian/changelog	2009-01-18 19:25:33 UTC (rev 1222)
@@ -16,7 +16,6 @@
     + patches/gentoo/007_dom-setAttributeNode-crash.patch
     + patches/gentoo/009_array-function-crashes.patch
     + patches/gentoo/010_ticks-zts-crashes.patch
-    + patches/gentoo/014_explode-overflow.patch
     + patches/gentoo/015_CVE-2008-2665-wrapper-safemode-bypass.patch
     + patches/gentoo/017_xmlrpc-invalid-callback-crash.patch
     + patches/gentoo/019_new-memory-corruption.patch

Deleted: php5/trunk/debian/patches/gentoo/014_explode-overflow.patch
===================================================================
--- php5/trunk/debian/patches/gentoo/014_explode-overflow.patch	2009-01-18 18:41:58 UTC (rev 1221)
+++ php5/trunk/debian/patches/gentoo/014_explode-overflow.patch	2009-01-18 19:25:33 UTC (rev 1222)
@@ -1,46 +0,0 @@
-Fix for an overflow issue in explode() (internal function: memnstr)
-Patch by Laurent Gaffie, accepted by upstream
-http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_bug.phpt?revision
-http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.11&r2=1.94.2.4.2.12&diff_format=u
-
-diff -r df1c020e171c -r 114012db1b3f Zend/zend_operators.h
---- a/Zend/zend_operators.h	Sat Jul 19 16:10:06 2008 +0200
-+++ b/Zend/zend_operators.h	Wed Aug 06 17:14:57 2008 +0200
-@@ -17,7 +17,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: zend_operators.h,v 1.94.2.4.2.11 2007/12/31 07:20:03 sebastian Exp $ */
-+/* $Id: zend_operators.h,v 1.94.2.4.2.12 2008/08/05 20:11:17 stas Exp $ */
- 
- #ifndef ZEND_OPERATORS_H
- #define ZEND_OPERATORS_H
-@@ -220,6 +220,9 @@
- 	char *p = haystack;
- 	char ne = needle[needle_len-1];
- 
-+	if(needle_len > end-haystack) {
-+		return NULL;
-+	}
- 	end -= needle_len;
- 
- 	while (p <= end) {
-diff -r df1c020e171c -r 114012db1b3f ext/standard/tests/strings/explode_bug.phpt
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/ext/standard/tests/strings/explode_bug.phpt	Wed Aug 06 17:14:57 2008 +0200
-@@ -0,0 +1,15 @@
-+--TEST--
-+Explode/memnstr bug
-+--INI--
-+error_reporting=2047
-+memory_limit=256M
-+--FILE--
-+<?php
-+$res = explode(str_repeat("A",145999999),1);
-+var_dump($res);
-+?>
-+--EXPECTF--
-+array(1) {
-+  [0]=>
-+  string(1) "1"
-+}

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2009-01-18 18:41:58 UTC (rev 1221)
+++ php5/trunk/debian/patches/series	2009-01-18 19:25:33 UTC (rev 1222)
@@ -45,7 +45,6 @@
 dba-inifile-truncation.patch
 gentoo/010_ticks-zts-crashes.patch
 gentoo/019_new-memory-corruption.patch
-gentoo/014_explode-overflow.patch
 gentoo/009_array-function-crashes.patch
 gentoo/015_CVE-2008-2665-wrapper-safemode-bypass.patch
 gentoo/017_xmlrpc-invalid-callback-crash.patch