[Pkg-php-commits] r1057 - in php5/branches/etch/debian: . patches

[Sean Finney]

tags 459020 pending
thanks

Author: seanius
Date: 2008-05-08 19:32:53 +0000 (Thu, 08 May 2008)
New Revision: 1057

Modified:
   php5/branches/etch/debian/changelog
   php5/branches/etch/debian/patches/043-recode_size_t.patch
Log:
merge from etch-proposed-updates

Modified: php5/branches/etch/debian/changelog
===================================================================
--- php5/branches/etch/debian/changelog	2008-05-05 23:03:23 UTC (rev 1056)
+++ php5/branches/etch/debian/changelog	2008-05-08 19:32:53 UTC (rev 1057)
@@ -1,3 +1,19 @@
+php5 (5.2.0-8+etch11~p2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- sean finney <seanius at debian.org>  Thu, 21 Feb 2008 07:09:01 +0100
+
+php5 (5.2.0-8+etch11~p1) stable; 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 06:46:02 +0100
+
 php5 (5.2.0-8+etch10) stable-security; urgency=high
 
   * Drop the patch for CVE-2007-4659 for now, since it causes

Modified: php5/branches/etch/debian/patches/043-recode_size_t.patch
===================================================================
--- php5/branches/etch/debian/patches/043-recode_size_t.patch	2008-05-05 23:03:23 UTC (rev 1056)
+++ php5/branches/etch/debian/patches/043-recode_size_t.patch	2008-05-08 19:32:53 UTC (rev 1057)
@@ -1,13 +1,16 @@
---- php-5.0.4/ext/recode/recode.c	2005-07-13 14:43:06.000000000 +1000
-+++ php-5.0.4/ext/recode/recode.c	2005-07-13 14:43:45.000000000 +1000
-@@ -129,8 +129,8 @@
+--- old/ext/recode/recode.c	2008-02-21 06:40:08.000000000 +0100
++++ new/ext/recode/recode.c	2008-02-21 06:40:34.000000000 +0100
+@@ -132,11 +132,11 @@
  {
  	RECODE_REQUEST request = NULL;
  	char *r = NULL;
 -	int r_len = 0, r_alen = 0;
--	int req_len, str_len;
 +	size_t r_len = 0, r_alen = 0;
-+	size_t req_len, str_len;
+ 	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;
+ 	}
+