traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from 3.2

This commit is contained in:
Senthil Kumaran 2011-04-06 14:16:08 +08:00
parent 28deea1fa5 ae664fb528
commit 736975a771
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_time.py
View File

@ -3,6 +3,7 @@ import time
import unittest import unittest
import locale import locale
import sysconfig import sysconfig
import sys
import warnings import warnings
class TimeTestCase(unittest.TestCase): class TimeTestCase(unittest.TestCase):
@ -39,6 +40,13 @@ class TimeTestCase(unittest.TestCase):
except ValueError: except ValueError:
self.fail('conversion specifier: %r failed.' % format) self.fail('conversion specifier: %r failed.' % format)
# Issue #10762: Guard against invalid/non-supported format string
# so that Python don't crash (Windows crashes when the format string
# input to [w]strftime is not kosher.
if sys.platform.startswith('win'):
with self.assertRaises(ValueError):
time.strftime('%f')
def _bounds_checking(self, func=time.strftime): def _bounds_checking(self, func=time.strftime):
# Make sure that strftime() checks the bounds of the various parts # Make sure that strftime() checks the bounds of the various parts
#of the time tuple (0 is valid for *all* values). #of the time tuple (0 is valid for *all* values).

2
Modules/timemodule.c
View File

@ -512,7 +512,7 @@ time_strftime(PyObject *self, PyObject *args)
if (outbuf[1]=='#') if (outbuf[1]=='#')
++outbuf; /* not documented by python, */ ++outbuf; /* not documented by python, */
if (outbuf[1]=='\0' || if (outbuf[1]=='\0' ||
!wcschr(L"aAbBcdfHIjmMpSUwWxXyYzZ%", outbuf[1])) !wcschr(L"aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
{ {
PyErr_SetString(PyExc_ValueError, "Invalid format string"); PyErr_SetString(PyExc_ValueError, "Invalid format string");
return 0; return 0;