stas                                     Thu, 24 Dec 2009 00:27:11 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=292572

Log:
fix interruption problem with array_pad

Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/standard/array.c

Modified: php/php-src/branches/PHP_5_2/ext/standard/array.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/array.c   2009-12-24 00:15:13 UTC 
(rev 292571)
+++ php/php-src/branches/PHP_5_2/ext/standard/array.c   2009-12-24 00:27:11 UTC 
(rev 292572)
@@ -2749,12 +2749,12 @@
                WRONG_PARAM_COUNT;
        }

+       convert_to_long_ex(pad_size);
        /* Make sure arguments are of the proper type */
        if (Z_TYPE_PP(input) != IS_ARRAY) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument 
should be an array");
                return;
        }
-       convert_to_long_ex(pad_size);

        /* Do some initial calculations */
        input_size = zend_hash_num_elements(Z_ARRVAL_PP(input));

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to