Fix zend_parse_method_parameters_ex() and make it consistant with

zend_parse_method_parameters().
# Obviously its only place of use is in pdo just right now.

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 7e0f6f840d8ed88fe66f222315009879a38406d7..1cf81d06b68c10be76c72a2833b6c86144a29cf3 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -603,52 +603,41 @@ ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr
 }
 
 
-ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, zend_class_entry *ce, void **object, ...)
+ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, ...)
 {
-       void **arg_stack = EG(argument_stack).top_element;
        va_list va;
        int retval;
+       char *p = type_spec;
+       zval **object;
+       zend_class_entry *ce;
        int quiet = flags & ZEND_PARSE_PARAMS_QUIET;
 
-       *object = this_ptr;
-
-       if (!*object) {
-               zval **parameter;
+       if (!this_ptr) {
+               va_start(va, type_spec);
+               retval = zend_parse_va_args(num_args, type_spec, &va, 0 TSRMLS_CC);
+               va_end(va);
+       } else {
+               p++;
+               va_start(va, type_spec);
 
-               if (zend_get_parameters_ex(1, &parameter) != SUCCESS) {
+               object = va_arg(va, zval **);
+               ce = va_arg(va, zend_class_entry *);
+               *object = this_ptr;
+               if (ce && !instanceof_function(Z_OBJCE_P(this_ptr), ce TSRMLS_CC)) {
                        if (!quiet) {
-                               zend_error(E_WARNING, "%s() expects an object of class %s as first parameter, none was given",
-                                       get_active_function_name(TSRMLS_C), ce->name);
+                               zend_error(E_CORE_ERROR, "%s::%s() must be derived from %s::%s",
+                                       ce->name, get_active_function_name(TSRMLS_C), Z_OBJCE_P(this_ptr)->name, get_active_function_name(TSRMLS_C));
                        }
-
                        return FAILURE;
-               } else {
-                       if (Z_TYPE_PP(parameter) == IS_OBJECT &&
-                                       instanceof_function(Z_OBJCE_PP(parameter), ce TSRMLS_CC)) {
-                               *object = *parameter;
-                       } else {
-                               if (!quiet) {
-                                       zend_error(E_WARNING, "%s() expects parameter 1 to be %s, %s given",
-                                               get_active_function_name(TSRMLS_C), ce->name,
-                                               zend_zval_type_name(*parameter));
-                               }
-
-                               return FAILURE;
-                       }
-
-                       EG(argument_stack).top_element++;
                }
-       }
-       
-       va_start(va, object);
-       retval = zend_parse_va_args(num_args, type_spec, &va, flags TSRMLS_CC);
-       va_end(va);
-
-       EG(argument_stack).top_element = arg_stack;
 
+               retval = zend_parse_va_args(num_args, p, &va, flags TSRMLS_CC);
+               va_end(va);
+       }
        return retval;
 }
 
+
 /* Argument parsing API -- andrei */
 
 

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index d3b0c76f2b78dcb81f2b4109856b343df00ef9b9..9a1e85095af8229c13beafd3cf39fab86db7d556 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -159,7 +159,7 @@ ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *t
 ZEND_API char *zend_zval_type_name(zval *arg);
 
 ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, ...);
-ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, zend_class_entry *ce, void **object, ...);
+ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, ...);
 
 /* End of parameter parsing API -- andrei */