- Reduce number of c-functions/macros involved in function invocation

- Unify names of remaining c-function/macro names

1 files changed, 6 insertions, 1 deletions

diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c
index c19f061421..7d4f24d069 100755
--- a/ext/spl/spl_engine.c
+++ b/ext/spl/spl_engine.c
@@ -176,6 +176,7 @@ int spl_call_method(zval **object_pp, zend_class_entry *obj_ce, zend_function **
 	int result;
 	zend_fcall_info fci;
 	zval z_fname;
+	zval *retval;
 
 	zval **params[2];
 
@@ -186,7 +187,7 @@ int spl_call_method(zval **object_pp, zend_class_entry *obj_ce, zend_function **
 	/*fci.function_table = NULL; will be read form zend_class_entry of object if needed */
 	fci.object_pp = object_pp;
 	fci.function_name = &z_fname;
-	fci.retval_ptr_ptr = retval_ptr;
+	fci.retval_ptr_ptr = retval_ptr ? retval_ptr : &retval;
 	fci.param_count = param_count;
 	fci.params = params;
 	fci.no_separation = 1;
@@ -216,6 +217,10 @@ int spl_call_method(zval **object_pp, zend_class_entry *obj_ce, zend_function **
 			result = zend_call_function(&fci, &fcic TSRMLS_CC);
 		}
 	}
+	if (!retval_ptr && fci.retval_ptr_ptr) {
+		zval_dtor(*fci.retval_ptr_ptr);
+		FREE_ZVAL(*fci.retval_ptr_ptr);
+	}
 	return result;
 }
 /* }}} */