Permalink
Browse files

Fixed bug #64359 strftime crash with VS2012

  • Loading branch information...
1 parent 9ed7eab commit 371000a877c91cfc11ff3c75ce83826797478569 @weltling weltling committed Mar 6, 2013
Showing with 14 additions and 1 deletion.
  1. +3 −0 NEWS
  2. +11 −1 ext/date/php_date.c
View
3 NEWS
@@ -13,6 +13,9 @@ PHP NEWS
- PCRE:
. Merged PCRE 8.32. (Anatol)
+- DateTime:
+ . Fixed bug #64359 (strftime crash with VS2012). (Anatol)
+
21 Feb 2013, PHP 5.5.0 Alpha 5
- Core:
View
@@ -1574,7 +1574,17 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
long timestamp = 0;
struct tm ta;
int max_reallocs = 5;
- size_t buf_len = 64, real_len;
+#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;
timelib_time *ts;
timelib_tzinfo *tzi;
timelib_time_offset *offset = NULL;

0 comments on commit 371000a

Please sign in to comment.