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

Fix problem spotted by Coverity that occurs if tzinfo.tzname().replace() 

returns a non-string when converting %Z.

Will backport.
This commit is contained in:
Neal Norwitz 2006-03-20 01:58:39 +00:00
parent 29892cc386
commit d5b0c9b87e
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_datetime.py
View File

@ -1168,6 +1168,17 @@ class TestDateTime(TestDate):
self.assertEqual(dt2 - dt1, us) self.assertEqual(dt2 - dt1, us)
self.assert_(dt1 < dt2) self.assert_(dt1 < dt2)
def test_strftime_with_bad_tzname_replace(self):
# verify ok if tzinfo.tzname().replace() returns a non-string
class MyTzInfo(FixedOffset):
def tzname(self, dt):
class MyStr(str):
def replace(self, *args):
return None
return MyStr('name')
t = self.theclass(2005, 3, 2, 0, 0, 0, 0, MyTzInfo(3, 'name'))
self.assertRaises(TypeError, t.strftime, '%Z')
def test_bad_constructor_arguments(self): def test_bad_constructor_arguments(self):
# bad years # bad years
self.theclass(MINYEAR, 1, 1) # no exception self.theclass(MINYEAR, 1, 1) # no exception

13
Modules/datetimemodule.c
View File

@ -1228,8 +1228,8 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
} }
} }
assert(zreplacement != NULL); assert(zreplacement != NULL);
ptoappend = PyString_AsString(zreplacement); ptoappend = PyString_AS_STRING(zreplacement);
ntoappend = PyString_Size(zreplacement); ntoappend = PyString_GET_SIZE(zreplacement);
} }
else if (ch == 'Z') { else if (ch == 'Z') {
/* format tzname */ /* format tzname */
@ -1257,14 +1257,18 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
Py_DECREF(temp); Py_DECREF(temp);
if (Zreplacement == NULL) if (Zreplacement == NULL)
goto Done; goto Done;
if (!PyString_Check(Zreplacement)) {
PyErr_SetString(PyExc_TypeError, "tzname.replace() did not return a string");
goto Done;
}
} }
else else
Py_DECREF(temp); Py_DECREF(temp);
} }
} }
assert(Zreplacement != NULL); assert(Zreplacement != NULL);
ptoappend = PyString_AsString(Zreplacement); ptoappend = PyString_AS_STRING(Zreplacement);
ntoappend = PyString_Size(Zreplacement); ntoappend = PyString_GET_SIZE(Zreplacement);
} }
else { else {
/* percent followed by neither z nor Z */ /* percent followed by neither z nor Z */
@ -1275,6 +1279,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
/* Append the ntoappend chars starting at ptoappend to /* Append the ntoappend chars starting at ptoappend to
* the new format. * the new format.
*/ */
assert(ptoappend != NULL);
assert(ntoappend >= 0); assert(ntoappend >= 0);
if (ntoappend == 0) if (ntoappend == 0)
continue; continue;