From 2007b1216aa1560d0714685f1082776c9c558766 Mon Sep 17 00:00:00 2001 From: Harald Radi Date: Mon, 5 Aug 2002 23:41:25 +0000 Subject: [PATCH] removed a possible NULL pointer referencing inside an error handler --- ext/com/COM.c | 13 +++++++++++-- 1 file 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) { -- 2.50.1