com php-src: Fixed segfault in _xml_xmlchar_zval: ext /xml/xml.c
| From: | Xinchen Hui | Date: | Mon, 05 May 2014 11:52:42 +0000 |
| Subject: | com php-src: Fixed segfault in _xml_xmlchar_zval: ext /xml/xml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78099@lists.php.net to get a copy of this message | ||
Commit: a636c4c03f89e626f6b778a3e3ab40e989ad225d
Author: Xinchen Hui <laruence@php.net> Mon, 5 May 2014 19:52:42 +0800
Parents: fa6f6c880741ae9696a9c21707fd3a844dd8d5ee
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a636c4c03f89e626f6b778a3e3ab40e989ad225d
Log:
Fixed segfault in _xml_xmlchar_zval
Changed paths:
M ext/xml/xml.c
Diff:
diff --git a/ext/xml/xml..c b/ext/xml/xml.c
index 169be95..bbb1223 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;
}