diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-05 19:52:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-05 19:52:42 +0800 |
| commit | a636c4c03f89e626f6b778a3e3ab40e989ad225d (patch) | |
| tree | 08ca60614d458453f15fae59ed94db1a349489c7 /ext/xml/xml.c | |
| parent | fa6f6c880741ae9696a9c21707fd3a844dd8d5ee (diff) | |
| download | php-git-a636c4c03f89e626f6b778a3e3ab40e989ad225d.tar.gz | |
Fixed segfault in _xml_xmlchar_zval
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |