MFB:

- Fixed bug #45556 (Return value from callback isn't freed).
- Fixed bug #45555 (Segfault with invalid non-string as register_introspection_callback).
- Fixed wrong arginfo for xmlrpc_encode_request()

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 4d43abd0ca50a50f23366a1a2f401e22d9715621..a6c9f08ec5244708da0c71fc396fbed94c6ba8a1 100644 (file)
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -97,7 +97,7 @@ ZEND_END_ARG_INFO()
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_encode_request, 0, 0, 2)
        ZEND_ARG_INFO(0, method)
-       ZEND_ARG_INFO(1, params)
+       ZEND_ARG_INFO(0, params)
        ZEND_ARG_INFO(0, output_options)
 ZEND_END_ARG_INFO()
 
@@ -936,60 +936,60 @@ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRe
  */
 static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
 {
-       zval *retval_ptr, **php_function;
+       zval retval, **php_function;
        zval* callback_params[1];
+       char *php_function_name;
        xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data;
        TSRMLS_FETCH();
 
-       MAKE_STD_ZVAL(retval_ptr);
-       Z_TYPE_P(retval_ptr) = IS_NULL;
-
        /* setup data hoojum */
        callback_params[0] = pData->caller_params;
 
        /* loop through and call all registered callbacks */
        zend_hash_internal_pointer_reset(Z_ARRVAL_P(pData->server->introspection_map));
        while(1) {
-               if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), 
-                       (void**)&php_function) == SUCCESS) {
-
-               /* php func prototype: function string user_func($user_params) */
-               if(call_user_function(CG(function_table), NULL, *php_function, 
-                       retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
-                       XMLRPC_VALUE xData;
-                       STRUCT_XMLRPC_ERROR err = {0};
+               if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), (void**)&php_function) == SUCCESS) {
+                       if (zend_is_callable(*php_function, 0, &php_function_name)) {
+                               /* php func prototype: function string user_func($user_params) */
+                               if (call_user_function(CG(function_table), NULL, *php_function, &retval, 1, callback_params TSRMLS_CC) == SUCCESS) {
+                                       XMLRPC_VALUE xData;
+                                       STRUCT_XMLRPC_ERROR err = {0};
 
-                       /* return value should be a string */
-                       convert_to_string(retval_ptr);
+                                       /* return value should be a string */
+                                       convert_to_string(&retval);
 
-                       xData = XMLRPC_IntrospectionCreateDescription(Z_STRVAL_P(retval_ptr), &err);
+                                       xData = XMLRPC_IntrospectionCreateDescription(Z_STRVAL(retval), &err);
 
-                       if(xData) {
-                               if(!XMLRPC_ServerAddIntrospectionData(server, xData)) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s(), improper element structure", Z_STRVAL_PP(php_function));
-                               }
-                               XMLRPC_CleanupValue(xData);
-                       } else {
-                               /* could not create description */
-                               if(err.xml_elem_error.parser_code) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", 
-                                               err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, Z_STRVAL_PP(php_function));
+                                       if(xData) {
+                                               if(!XMLRPC_ServerAddIntrospectionData(server, xData)) {
+                                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s(), improper element structure", php_function_name);
+                                               }
+                                               XMLRPC_CleanupValue(xData);
+                                       } else {
+                                               /* could not create description */
+                                               if(err.xml_elem_error.parser_code) {
+                                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", 
+                                                               err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, php_function_name);
+                                               } else {
+                                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s()", 
+                                                       php_function_name);
+                                               }
+                                       }
+                                       zval_dtor(&retval);
                                } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s()", 
-                                       Z_STRVAL_PP(php_function));
+                                       /* user func failed */
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error calling user introspection callback: %s()", php_function_name);
                                }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid callback '%s' passed", php_function_name);
                        }
+                       efree(php_function_name);
                } else {
-                       /* user func failed */
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error calling user introspection callback: %s()", Z_STRVAL_PP(php_function));
+                       break;
                }
-       } else {
-               break;
+               zend_hash_move_forward(Z_ARRVAL_P(pData->server->introspection_map));
        }
-
-       zend_hash_move_forward(Z_ARRVAL_P(pData->server->introspection_map));
-       }
-
+       
        /* so we don't call the same callbacks ever again */
        zend_hash_clean(Z_ARRVAL_P(pData->server->introspection_map));
 }