mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
check for NULL and avoid crashes
This commit is contained in:
parent
e7f2c5bd6a
commit
c140bbb5db
@ -3014,7 +3014,11 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
|
|||||||
xmlFreeNode(dummy);
|
xmlFreeNode(dummy);
|
||||||
} ZEND_HASH_FOREACH_END();
|
} ZEND_HASH_FOREACH_END();
|
||||||
smart_str_0(&list);
|
smart_str_0(&list);
|
||||||
xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s));
|
if (list.s) {
|
||||||
|
xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s));
|
||||||
|
} else {
|
||||||
|
xmlNodeSetContentLen(ret, BAD_CAST(""), 0);
|
||||||
|
}
|
||||||
smart_str_free(&list);
|
smart_str_free(&list);
|
||||||
} else {
|
} else {
|
||||||
zval tmp;
|
zval tmp;
|
||||||
@ -3054,7 +3058,11 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
|
|||||||
start = next;
|
start = next;
|
||||||
}
|
}
|
||||||
smart_str_0(&list);
|
smart_str_0(&list);
|
||||||
xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s));
|
if (list.s) {
|
||||||
|
xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s));
|
||||||
|
} else {
|
||||||
|
xmlNodeSetContentLen(ret, BAD_CAST(""), 0);
|
||||||
|
}
|
||||||
smart_str_free(&list);
|
smart_str_free(&list);
|
||||||
efree(str);
|
efree(str);
|
||||||
if (data == &tmp) {zval_dtor(&tmp);}
|
if (data == &tmp) {zval_dtor(&tmp);}
|
||||||
|
Loading…
Reference in New Issue
Block a user