[php-pecl-memcache/f16] switch back to previous patch

[Remi Collet]

commit a345637bbbbda07f8eebe8cbac820e41d2147c5a
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Sep 25 08:58:08 2012 +0200

    switch back to previous patch

 ...> php-pecl-memcache-3.0.5-get-mem-corrupt.patch |   73 ++++++++++----------
 php-pecl-memcache.spec                             |   10 ++-
 2 files changed, 44 insertions(+), 39 deletions(-)
---
diff --git a/php-pecl-memcache-3.0.7-get-mem-corrupt.patch b/php-pecl-memcache-3.0.5-get-mem-corrupt.patch
similarity index 52%
rename from php-pecl-memcache-3.0.7-get-mem-corrupt.patch
rename to php-pecl-memcache-3.0.5-get-mem-corrupt.patch
index 109d38e..0b7c66c 100644
--- a/php-pecl-memcache-3.0.7-get-mem-corrupt.patch
+++ b/php-pecl-memcache-3.0.5-get-mem-corrupt.patch
@@ -1,10 +1,34 @@
---- pecl/memcache/branches/NON_BLOCKING_IO/memcache_pool.c	2012/09/23 07:13:18	327753
-+++ pecl/memcache/branches/NON_BLOCKING_IO/memcache_pool.c	2012/09/23 08:29:10	327754
-@@ -426,13 +426,15 @@
- {
+From 6e09e8db8d36de6a5020f5d517f62a8c16af8222 Mon Sep 17 00:00:00 2001
+From: "Vojtech Vitek (V-Teq)" <vvitek at redhat.com>
+Date: Mon, 17 Oct 2011 16:17:51 +0200
+Subject: [PATCH] fix get/unserialize memory corruption
+
+Possible memory corruption (and segfault) after unserialising objects:
+<?php
+$obj = new StdClass;
+$obj->obj = $obj;
+$memcache = new Memcache;
+$memcache->connect('127.0.0.1', 11211);
+$memcache->set('x', $obj, false, 300);
+$x = $memcache->get('x');
+$x = $memcache->get('x');
+$x = $memcache->get('x');
+$x = $memcache->get('x');
+$x = $memcache->get('x');
+
+Patch by Paul Clifford.
+
+---
+ memcache-3.0.5/memcache_pool.c |   15 +++++++--------
+ 1 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git memcache-3.0.5/memcache_pool.c memcache-3.0.5/memcache_pool.c
+index 420a773..e89ebce 100644
+--- memcache-3.0.5/memcache_pool.c
++++ memcache-3.0.5/memcache_pool.c
+@@ -422,8 +422,8 @@ int mmc_unpack_value(
  	char *data = NULL;
  	unsigned long data_len;
-+	int rv;
  
 -	zval value;
 -	INIT_ZVAL(value);
@@ -13,12 +37,7 @@
  
  	if (flags & MMC_COMPRESSED) {
  		if (mmc_uncompress(buffer->value.c, bytes, &data, &data_len) != MMC_OK) {
- 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to uncompress data");
-+			zval_ptr_dtor(&object);
- 			return MMC_REQUEST_DONE;
- 		}
- 	}
-@@ -444,7 +446,6 @@
+@@ -439,7 +439,6 @@ int mmc_unpack_value(
  	if (flags & MMC_SERIALIZED) {
  		php_unserialize_data_t var_hash;
  		const unsigned char *p = (unsigned char *)data;
@@ -26,26 +45,7 @@
  
  		char key_tmp[MMC_MAX_KEY_LEN + 1];
  		mmc_request_value_handler value_handler;
-@@ -476,6 +477,7 @@
- 			}
- 
- 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to unserialize data");
-+			zval_ptr_dtor(&object);
- 			return MMC_REQUEST_DONE;
- 		}
- 
-@@ -492,7 +494,9 @@
- 		}
- 
- 		/* delegate to value handler */
--		return value_handler(key_tmp, key_len, object, flags, cas, value_handler_param TSRMLS_CC);
-+		rv = value_handler(key_tmp, key_len, object, flags, cas, value_handler_param TSRMLS_CC);
-+		zval_ptr_dtor(&object);
-+		return rv;
- 	}
- 	else {
- 		switch (flags & 0x0f00) {
-@@ -500,7 +504,7 @@
+@@ -495,7 +494,7 @@ int mmc_unpack_value(
  				long val;
  				data[data_len] = '\0';
  				val = strtol(data, NULL, 10);
@@ -54,7 +54,7 @@
  				break;
  			}
  
-@@ -508,17 +512,17 @@
+@@ -503,17 +502,17 @@ int mmc_unpack_value(
  				double val = 0;
  				data[data_len] = '\0';
  				sscanf(data, "%lg", &val);
@@ -75,14 +75,15 @@
  
  				if (!(flags & MMC_COMPRESSED)) {
  					/* release buffer because it's now owned by the zval */
-@@ -527,7 +531,9 @@
+@@ -522,7 +521,7 @@ int mmc_unpack_value(
  		}
  
  		/* delegate to value handler */
 -		return request->value_handler(key, key_len, &value, flags, cas, request->value_handler_param TSRMLS_CC);
-+		rv = request->value_handler(key, key_len, object, flags, cas, request->value_handler_param TSRMLS_CC);
-+		zval_ptr_dtor(&object);
-+		return rv;
++		return request->value_handler(key, key_len, object, flags, cas, request->value_handler_param TSRMLS_CC);
  	}
  }
  /* }}}*/
+-- 
+1.7.6.2
+
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 21b2119..481114f 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -5,7 +5,7 @@
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
 Version:      3.0.7
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/%{pecl_name}
@@ -17,7 +17,7 @@ Source3:      LICENSE
 
 # https://bugs.php.net/63142
 # http://svn.php.net/viewvc/pecl/memcache/branches/NON_BLOCKING_IO/memcache_pool.c?r1=327754&r2=327753&pathrev=327754
-Patch2:       php-pecl-memcache-3.0.7-get-mem-corrupt.patch
+Patch2:       php-pecl-memcache-3.0.5-get-mem-corrupt.patch
 
 BuildRequires: php-devel, php-pear, zlib-devel
 
@@ -49,7 +49,7 @@ Memcache can be used as a PHP session handler.
 %setup -c -q
 
 pushd %{pecl_name}-%{version}
-%patch2 -p4 -b .get-mem-corrupt.patch
+%patch2 -p1 -b .get-mem-corrupt.patch
 
 # Chech version as upstream often forget to update this
 extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' php_memcache.h)
@@ -149,6 +149,10 @@ fi
 
 
 %changelog
+* Tue Sep 25 2012 Remi Collet <remi at fedoraproject.org> - 3.0.7-3
+- switch back to previous patch as possible memleak
+  more acceptable than certain segfault
+
 * Sun Sep 23 2012 Remi Collet <remi at fedoraproject.org> - 3.0.7-2
 - use upstream patch instead of our (memleak)