diff options
| author | Harald Radi <phanto@php.net> | 2002-08-05 23:41:25 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2002-08-05 23:41:25 +0000 |
| commit | 2007b1216aa1560d0714685f1082776c9c558766 (patch) | |
| tree | 52b4799218233f79ca05fdf75287d7f08bc69e2f | |
| parent | 01dee775d142b5ff26aeec2f30c1d5313025a2bf (diff) | |
| download | php-git-2007b1216aa1560d0714685f1082776c9c558766.tar.gz | |
removed a possible NULL pointer referencing inside an error handler
| -rw-r--r-- | ext/com/COM.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index 86c460b421..022d9d93d0 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -1566,7 +1566,12 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property, FREE_VARIANT(var_result); FREE_VARIANT(new_value); - RETURN_NULL(); + + if (return_value) { + RETVAL_NULL(); + } + + return; } 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(propname); - RETURN_NULL(); + if (return_value) { + RETVAL_NULL(); + } + + return; } if (return_value) { |