[Pkg-php-commits] r1148 - php5/trunk/debian/patches

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-08-26 18:08:22 +0000 (Tue, 26 Aug 2008)
New Revision: 1148

Removed:
   php5/trunk/debian/patches/118-simplexml-segv.patch
Log:
Patch merged upstream several months ago


Deleted: php5/trunk/debian/patches/118-simplexml-segv.patch
===================================================================
--- php5/trunk/debian/patches/118-simplexml-segv.patch	2008-08-24 17:35:18 UTC (rev 1147)
+++ php5/trunk/debian/patches/118-simplexml-segv.patch	2008-08-26 18:08:22 UTC (rev 1148)
@@ -1,51 +0,0 @@
-Index: ext/simplexml/simplexml.c
-===================================================================
-RCS file: /repository/php-src/ext/simplexml/simplexml.c,v
-retrieving revision 1.151.2.22.2.21
-diff -u -p -d -r1.151.2.22.2.21 simplexml.c
---- old/ext/simplexml/simplexml.c	12 Feb 2007 21:06:29 -0000	1.151.2.22.2.21
-+++ new/ext/simplexml/simplexml.c	20 Feb 2007 12:47:46 -0000
-@@ -56,6 +56,7 @@ static php_sxe_object* php_sxe_object_ne
- static zend_object_value php_sxe_register_object(php_sxe_object * TSRMLS_DC);
- static xmlNodePtr php_sxe_reset_iterator(php_sxe_object *sxe, int use_data TSRMLS_DC);
- static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, int use_data TSRMLS_DC);
-+static zval *sxe_get_value(zval *z TSRMLS_DC);
- 
- /* {{{ _node_as_zval()
-  */
-@@ -427,6 +428,7 @@ static void sxe_prop_dim_write(zval *obj
- 	int             is_attr = 0;
- 	int				nodendx = 0;
- 	int             test = 0;
-+	int				new_value = 0;
- 	long            cnt;
- 	zval            tmp_zv, trim_zv, value_copy;
- 
-@@ -504,8 +506,17 @@ static void sxe_prop_dim_write(zval *obj
- 				break;
- 			case IS_STRING:
- 				break;
-+			case IS_OBJECT:
-+				if (Z_OBJCE_P(value) == sxe_class_entry) {
-+					value = sxe_get_value(value TSRMLS_CC);
-+					INIT_PZVAL(value);
-+					new_value = 1;
-+					break;
-+				}
-+				/* break is missing intentionally */
- 			default:
- 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not yet possible to assign complex types to %s", attribs ? "attributes" : "properties");
-+				return;
- 		}
- 	}
- 
-@@ -594,6 +605,9 @@ next_iter:
- 	if (value && value == &value_copy) {
- 		zval_dtor(value);
- 	}
-+	if (new_value) {
-+		zval_ptr_dtor(&value);
-+	}
- }
- /* }}} */
-