From: Xinchen Hui <laruence@php.net>
Date: Mon, 5 May 2014 11:52:42 +0000 (+0800)
Subject: Fixed segfault in _xml_xmlchar_zval
X-Git-Tag: POST_PHPNG_MERGE~412^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a636c4c03f89e626f6b778a3e3ab40e989ad225d;p=php

Fixed segfault in _xml_xmlchar_zval
---

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 169be95981..bbb1223f8b 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -378,6 +378,7 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi
 {
 	if (s == NULL) {
 		ZVAL_FALSE(ret);
+		return;
 	}
 	if (len == 0) {
 		len = _xml_xmlcharlen(s);
@@ -1195,7 +1196,7 @@ PHP_FUNCTION(xml_set_object)
 	zval_add_ref(&parser->object); 
 #endif */
 
-	ZVAL_COPY(&parser->object, mythis);
+	ZVAL_DUP_DEREF(&parser->object, mythis);
 
 	RETVAL_TRUE;
 }