[Python-checkins] cpython (3.4): Issue #24917: time_strftime() buffer over-read.

[steve.dower]

https://hg.python.org/cpython/rev/f185917498ca
changeset:   97732:f185917498ca
branch:      3.4
parent:      97720:7a9dddc11f2e
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sun Sep 06 22:18:36 2015 -0700
summary:
  Issue #24917: time_strftime() buffer over-read.

files:
  Misc/NEWS            |  2 ++
  Modules/timemodule.c |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,8 @@
 Library
 -------
 
+- Issue #24917: time_strftime() buffer over-read.
+
 - Issue #23144: Make sure that HTMLParser.feed() returns all the data, even
   when convert_charrefs is True.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -655,6 +655,8 @@
         outbuf != NULL;
         outbuf = wcschr(outbuf+2, '%'))
     {
+        if (outbuf[1] == L'\0')
+            break;
         /* Issue #19634: On AIX, wcsftime("y", (1899, 1, 1, 0, 0, 0, 0, 0, 0))
            returns "0/" instead of "99" */
         if (outbuf[1] == L'y' && buf.tm_year < 0) {

-- 
Repository URL: https://hg.python.org/cpython