com php-src: simplified the previous fix for #64359: ext/date/php_date.c
| From: | Anatol Belski | Date: | Wed, 06 Mar 2013 15:48:51 +0000 |
| Subject: | com php-src: simplified the previous fix for #64359: ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71406@lists.php.net to get a copy of this message | ||
Commit: 8589dfb6cce4de3c13456486760c5d9e3dbc3b43
Author: Anatol Belski <ab@php.net> Wed, 6 Mar 2013 16:48:51 +0100
Parents: 371000a877c91cfc11ff3c75ce83826797478569
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8589dfb6cce4de3c13456486760c5d9e3dbc3b43
Log:
simplified the previous fix for #64359
Bugs:
https://bugs.php.net/64359
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 418747c..7195857 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1574,17 +1574,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
long timestamp = 0;
struct tm ta;
int max_reallocs = 5;
-#ifdef PHP_WIN32
- /* VS2012 has a bug where strftime crash with %z and %Z format when the
- initial buffer is too small. Increasing the buffer size helps in a
- workaround to fixs longer format strings for this VS version.
- http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code
- */
- size_t buf_len = 256;
-#else
- size_t buf_len = 64;
-#endif
- size_t real_len;
+ size_t buf_len = 256, real_len;
timelib_time *ts;
timelib_tzinfo *tzi;
timelib_time_offset *offset = NULL;
@@ -1637,6 +1627,9 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
#endif
}
+ /* VS2012 crt has a bug where strftime crash with %z and %Z format when the
+ initial buffer is too small. See
+ http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code
*/
buf = (char *) emalloc(buf_len);
while ((real_len=strftime(buf, buf_len, format, &ta))==buf_len || real_len==0) {
buf_len *= 2;