--- embedaddon/php/ext/xmlrpc/xmlrpc-epi-php.c 2012/02/21 23:48:05 1.1.1.1 +++ embedaddon/php/ext/xmlrpc/xmlrpc-epi-php.c 2012/05/29 12:34:45 1.1.1.2 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.1.1.1 2012/02/21 23:48:05 misho Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.1.1.2 2012/05/29 12:34:45 misho Exp $ */ /********************************************************************** * BUGS: * @@ -1043,9 +1043,8 @@ PHP_FUNCTION(xmlrpc_server_register_method) */ if (XMLRPC_ServerRegisterMethod(server->server_ptr, method_key, php_xmlrpc_callback)) { /* save for later use */ - MAKE_STD_ZVAL(method_name_save); - *method_name_save = **method_name; - zval_copy_ctor(method_name_save); + ALLOC_ZVAL(method_name_save); + MAKE_COPY_ZVAL(method_name, method_name_save); /* register our php method */ add_zval(server->method_map, method_key, &method_name_save); @@ -1073,9 +1072,8 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_call if (type == le_xmlrpc_server) { /* save for later use */ - MAKE_STD_ZVAL(method_name_save); - *method_name_save = **method_name; - zval_copy_ctor(method_name_save); + ALLOC_ZVAL(method_name_save); + MAKE_COPY_ZVAL(method_name, method_name_save); /* register our php method */ add_zval(server->introspection_map, NULL, &method_name_save); @@ -1242,8 +1240,7 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions) retval = XMLRPC_to_PHP(xVal); if (retval) { - *return_value = *retval; - zval_copy_ctor(return_value); + RETVAL_ZVAL(retval, 1, 1); } /* dust, sweep, and mop */ XMLRPC_CleanupValue(xVal);