[PHP-CVS] cvs: php-src /ext/date php_date.c

[Ilia Alshanetsky]

iliaa           Sun Mar  9 18:10:09 2008 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  
  MFB: Initialize ts only after successful argument parsing
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.170&r2=1.171&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.170 php-src/ext/date/php_date.c:1.171
--- php-src/ext/date/php_date.c:1.170   Fri Mar  7 02:05:48 2008
+++ php-src/ext/date/php_date.c Sun Mar  9 18:10:09 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.170 2008/03/07 02:05:48 iliaa Exp $ */
+/* $Id: php_date.c,v 1.171 2008/03/09 18:10:09 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1013,12 +1013,12 @@
        long    ts;
        char   *string;
 
-       if (ZEND_NUM_ARGS() == 1) {
-               ts = time(NULL);
-       }
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, 
&format_len, &ts) == FAILURE) {
                RETURN_FALSE;
        }
+       if (ZEND_NUM_ARGS() == 1) {
+               ts = time(NULL);
+       }
 
        string = php_format_date(format, format_len, ts, localtime TSRMLS_CC);
 



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