Apparently multi_convert_to_double_ex() didn't quite do what I

thought. Still need to handle numeric strings.

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 8e37a81dbd33db96e8271edd3fc650baafa0b154..147160f6624ccdd3ce9759b0e8900f36a844673c 100644 (file)
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -432,10 +432,11 @@ PHP_FUNCTION(pow)
        double dval;
        zend_bool wantlong;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &zbase, &zexp) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/z/", &zbase, &zexp) == FAILURE) {
                return;
        }
 
+       /* TODO: handle numeric strings. */
        if ((Z_TYPE_P(zbase) != IS_LONG && Z_TYPE_P(zbase) != IS_DOUBLE) ||
                (Z_TYPE_P(zexp ) != IS_LONG && Z_TYPE_P(zexp ) != IS_DOUBLE)) {
                php_error(E_WARNING, "Invalid argument(s) passed to %s()", get_active_function_name(TSRMLS_C));
@@ -446,8 +447,8 @@ PHP_FUNCTION(pow)
        wantlong = Z_TYPE_P(zbase) == IS_LONG 
                && Z_TYPE_P(zexp ) == IS_LONG && Z_LVAL_P(zexp) >= 0;
 
-       /* need to SEPERATE_ZVAL? */
-       multi_convert_to_double_ex(2,&zbase,&zexp);
+       convert_to_double(zbase);
+       convert_to_double(zexp);
        
        /* go ahead and calculate things. */
        dval = pow(Z_DVAL_P(zbase),Z_DVAL_P(zexp));