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

[Sean Finney]

tags 459020 pending
thanks

Author: seanius
Date: 2008-02-20 23:59:55 +0000 (Wed, 20 Feb 2008)
New Revision: 997

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/043-recode_size_t.patch
Log:
fix for 459020

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-02-20 23:25:23 UTC (rev 996)
+++ php5/trunk/debian/changelog	2008-02-20 23:59:55 UTC (rev 997)
@@ -1,3 +1,13 @@
+php5 (5.2.5-3) UNRELEASED; urgency=high
+
+  * zend_parse_parameters does not handle size_t's, causing issues with
+    043-recode_size_t.patch and segmentation faults for recode-using pages.
+    changed problematic parameters back to "int" and added an overflow check.
+    thanks to Thomas Stegbauer, Tim Dijkstra, Bart Cortooms, Sebastian Göbel,
+    and Vincent Tondellier for their reports.  closes: #459020.
+
+ -- Sean Finney <seanius at debian.org>  Thu, 21 Feb 2008 00:59:21 +0100
+
 php5 (5.2.5-2) unstable; urgency=low
 
   * debian/patches/libdb_is_-ldb: reorder the search for db4 instances to

Modified: php5/trunk/debian/patches/043-recode_size_t.patch
===================================================================
--- php5/trunk/debian/patches/043-recode_size_t.patch	2008-02-20 23:25:23 UTC (rev 996)
+++ php5/trunk/debian/patches/043-recode_size_t.patch	2008-02-20 23:59:55 UTC (rev 997)
@@ -1,13 +1,13 @@
-Index: php5-5.2.4/ext/recode/recode.c
+Index: php5-5.2.5/ext/recode/recode.c
 ===================================================================
---- php5-5.2.4.orig/ext/recode/recode.c	2007-06-22 02:02:15.000000000 +0200
-+++ php5-5.2.4/ext/recode/recode.c	2007-09-11 00:26:24.000000000 +0200
-@@ -133,7 +133,7 @@
- 	RECODE_REQUEST request = NULL;
- 	char *r = NULL;
- 	size_t r_len = 0, r_alen = 0;
--	int req_len, str_len;
-+	size_t req_len, str_len;
+--- php5-5.2.5.orig/ext/recode/recode.c	2007-06-22 02:02:15.000000000 +0200
++++ php5-5.2.5/ext/recode/recode.c	2008-02-21 00:46:54.000000000 +0100
+@@ -136,7 +136,7 @@
+ 	int req_len, str_len;
  	char *req, *str;
  
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &req, &req_len, &str, &str_len) == FAILURE) {
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &req, &req_len, &str, &str_len) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &req, &req_len, &str, &str_len) == FAILURE || str_len < 0) {
+ 		return;
+ 	}
+