- MFH: Fixed bug #48087 (call_user_method() invalid free of arguments)

diff --git a/NEWS b/NEWS
index 30c6e916087b8056189bfaf232fbfb9785d758be..e80696be1d03f60f28631dffa9a24125a87a5b4d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
   disable this behaviour using "http"=>array("auto_decode"=>0) in stream
   context. (Dmitry)
 
+- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
 - Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
 - Fixed bug #48004 (Error handler prevents creation of default object).

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 3da1408640b9a15ab70ccc4281da408e3b06d63a..b65c4575fa9567651494efdef8d63c4dff9d3c17 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4780,7 +4780,9 @@ PHP_FUNCTION(call_user_method)
        } else {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call %s()", Z_STRVAL_P(callback));
        }
-       efree(params);
+       if (n_params) {
+               efree(params);
+       }
 }
 /* }}} */