mirror of
https://github.com/php/php-src.git
synced 2025-08-21 01:45:16 +02:00
removed a possible NULL pointer referencing inside an error handler
This commit is contained in:
parent
01dee775d1
commit
2007b1216a
1 changed files with 11 additions and 2 deletions
|
@ -1566,7 +1566,12 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
|
||||||
FREE_VARIANT(var_result);
|
FREE_VARIANT(var_result);
|
||||||
FREE_VARIANT(new_value);
|
FREE_VARIANT(new_value);
|
||||||
|
|
||||||
RETURN_NULL();
|
|
||||||
|
if (return_value) {
|
||||||
|
RETVAL_NULL();
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
php_pval_to_variant(value, new_value, codepage TSRMLS_CC);
|
php_pval_to_variant(value, new_value, codepage TSRMLS_CC);
|
||||||
|
@ -1592,7 +1597,11 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
|
||||||
efree(new_value);
|
efree(new_value);
|
||||||
efree(propname);
|
efree(propname);
|
||||||
|
|
||||||
RETURN_NULL();
|
if (return_value) {
|
||||||
|
RETVAL_NULL();
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (return_value) {
|
if (return_value) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue