Merge lp:~clint-fewbar/ubuntu/maverick/php5/maverick-beta-papercuts into lp:ubuntu/maverick/php5

[Clint Byrum]

- ini change is quite trivial
- pgsql patch tested using phppgadmin, seems to work fine.

[Thierry Carrez (ttx)]

Looks good, uploading in a few.

review: Approve

[Thierry Carrez (ttx)]

Beh, already merged.

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-06 13:10:17 +0000
+++ debian/changelog	2010-08-13 15:11:01 +0000
@@ -1,3 +1,11 @@
+php5 (5.3.3-1ubuntu4) maverick; urgency=low
+
+  * debian/php5-module.ini: # replaced with ; (LP: #591286)
+  * debian/patches/php52389-pgsql-segfault.patch (LP: #607646)
+    - Applying patch for upstream bug that causes segfaults in pgsql
+
+ -- Clint Byrum <[e-mail]>  Fri, 13 Aug 2010 00:07:15 -0700
+
 php5 (5.3.3-1ubuntu3) maverick; urgency=low
 
   * debian/patches/lp564920-fix-big-files.patch: Fix downloading of large

=== added file 'debian/patches/php52389-pgsql-segfault.patch'
--- debian/patches/php52389-pgsql-segfault.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/php52389-pgsql-segfault.patch	2010-08-13 15:11:01 +0000
@@ -0,0 +1,78 @@
+From: [e-mail]
+Subject: Memory (de)allocation problem for pgsql notice
+Description:In the ext/pgsql.c pgsql_globals->notices structure is allocated as
+ persistent but individual messages non persistent. Thus the destructor
+ _php_pgsql_notice_ptr_dtor happens to try to free memory that was
+ already freed by the garbage collector and the thread exits with
+ segmentation fault.
+ .
+ Program received signal SIGSEGV, Segmentation fault.
+ 0x00007ffff3cd3013 in _zend_mm_free_int (heap=0x7ffff844b5c0, p=0x7ffff9397390) 
+     at /usr/src/php_no_suhosin/php5-5.3.2/Zend/zend_alloc.c:2018
+     2018            if (ZEND_MM_IS_FREE_BLOCK(next_block)) {
+         (gdb) backtrace
+ #0  0x00007ffff3cd3013 in _zend_mm_free_int (heap=0x7ffff844b5c0, 
+         p=0x7ffff9397390) at /usr/src/php_no_suhosin/php5-5.3.2/Zend/zend_alloc.c:2018
+ #1  0x00007ffff3cd3de1 in _efree (ptr=0x7ffff9397390) at 
+ /usr/src/php_no_suhosin/php5-5.3.2/Zend/zend_alloc.c:2351
+ #2  0x00007fffeb4d3419 in _php_pgsql_notice_ptr_dtor (ptr=0x7ffff9396708) at 
+ /tmp/pgsql/pgsql.c:841
+ .
+ While the patch has not been accepted yet in PHP upstream, the logic appears
+ sound enough to move forward with the patch.
+ .
+ Note: original patch was not in unified diff format. Reformatted as such.
+
+Origin: upstream, http://bugs.php.net/bug.php?id=52389
+Bug: http://bugs.php.net/bug.php?id=52389
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/607646
+Reviewed-by: Clint Byrum <[e-mail]>
+
+=== modified file 'ext/pgsql/pgsql.c'
+--- a/ext/pgsql/pgsql.c	2010-08-01 11:58:54 +0000
++++ b/ext/pgsql/pgsql.c	2010-08-13 07:03:38 +0000
+@@ -742,7 +742,11 @@
+ 	if (len) {
+ 		*len = i;
+ 	}
+-	return estrndup(message, i);
++	
++	//return estrndup(message, i);
++	char *ret_msg = (char *)pemalloc((i+1)*sizeof(char), 1);
++	memcpy(ret_msg, message, (i+1)*sizeof(char));
++	return ret_msg;
+ }
+ /* }}} */
+ 
+@@ -814,7 +818,7 @@
+ 	
+ 	TSRMLS_FETCH();
+ 	if (! PGG(ignore_notices)) {
+-		notice = (php_pgsql_notice *)emalloc(sizeof(php_pgsql_notice));
++		notice = (php_pgsql_notice *)pemalloc(sizeof(php_pgsql_notice), 1);
+ 		notice->message = _php_pgsql_trim_message(message, &notice->len);
+ 		if (PGG(log_notices)) {
+ 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", notice->message);
+@@ -824,16 +828,17 @@
+ }
+ /* }}} */
+ 
+-#define PHP_PGSQL_NOTICE_PTR_DTOR (void (*)(void *))_php_pgsql_notice_ptr_dtor
++#define PHP_PGSQL_NOTICE_PTR_DTOR (void (*)(void **))_php_pgsql_notice_ptr_dtor
+ 
+ /* {{{ _php_pgsql_notice_dtor
+  */
+ static void _php_pgsql_notice_ptr_dtor(void **ptr) 
+ {
+ 	php_pgsql_notice *notice = (php_pgsql_notice *)*ptr;
+-	if (notice) {
+- 		efree(notice->message);
+-  		efree(notice);
++	int ref_count =  (*(zval*)*ptr).refcount__gc;
++	if (notice && ref_count) {
++ 		pefree(notice->message, 1);
++  		pefree(notice, 1);
+   		notice = NULL;
+   	}
+ }
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-06 13:10:17 +0000
+++ debian/patches/series	2010-08-13 15:11:01 +0000
@@ -56,3 +56,4 @@
 php-fpm-man-section-and-cleanup.patch
 fpm-config.patch
 lp564920-fix-big-files.patch
+php52389-pgsql-segfault.patch

=== modified file 'debian/php5-module.ini'
--- debian/php5-module.ini	2010-05-25 10:17:00 +0000
+++ debian/php5-module.ini	2010-08-13 15:11:01 +0000
@@ -1,2 +1,2 @@
-# configuration for php @extname@ module
+; configuration for php @extname@ module
 extension=@dsoname@.so