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

neal.norwitz · neal.norwitz · commit b6ece3adcbf6 · 2006-03-20T01:58:39.000Z
returns a non-string when converting %Z. Will backport. git-svn-id: http://svn.python.org/projects/python/trunk@43147 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
@@ -1168,6 +1168,17 @@ def test_tz_independent_comparing(self):
         self.assertEqual(dt2 - dt1, us)
         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):
         # bad years
         self.theclass(MINYEAR, 1, 1)  # no exception
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
@@ -1228,8 +1228,8 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
 				}
 			}
 			assert(zreplacement != NULL);
-			ptoappend = PyString_AsString(zreplacement);
-			ntoappend = PyString_Size(zreplacement);
+			ptoappend = PyString_AS_STRING(zreplacement);
+			ntoappend = PyString_GET_SIZE(zreplacement);
 		}
 		else if (ch == 'Z') {
 			/* format tzname */
@@ -1257,14 +1257,18 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
 						Py_DECREF(temp);
 						if (Zreplacement == NULL)
 							goto Done;
+						if (!PyString_Check(Zreplacement)) {
+							PyErr_SetString(PyExc_TypeError, "tzname.replace() did not return a string");
+							goto Done;
+						}
 					}
 					else
 						Py_DECREF(temp);
 				}
 			}
 			assert(Zreplacement != NULL);
-			ptoappend = PyString_AsString(Zreplacement);
-			ntoappend = PyString_Size(Zreplacement);
+			ptoappend = PyString_AS_STRING(Zreplacement);
+			ntoappend = PyString_GET_SIZE(Zreplacement);
 		}
 		else {
 			/* 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
  		 * the new format.
  		 */
+ 		assert(ptoappend != NULL);
  		assert(ntoappend >= 0);
  		if (ntoappend == 0)
  			continue;

Original file line number	Diff line number	Diff line change
`@@ -1228,8 +1228,8 @@ wrap_strftime(PyObject object, PyObject format, PyObject *timetuple,`
`1228`	`1228`	`}`
`1229`	`1229`	`}`
`1230`	`1230`	`assert(zreplacement != NULL);`
`1231`		`- ptoappend = PyString_AsString(zreplacement);`
`1232`		`- ntoappend = PyString_Size(zreplacement);`
	`1231`	`+ ptoappend = PyString_AS_STRING(zreplacement);`
	`1232`	`+ ntoappend = PyString_GET_SIZE(zreplacement);`
`1233`	`1233`	`}`
`1234`	`1234`	`else if (ch == 'Z') {`
`1235`	`1235`	`/* format tzname */`
`@@ -1257,14 +1257,18 @@ wrap_strftime(PyObject object, PyObject format, PyObject *timetuple,`
`1257`	`1257`	`Py_DECREF(temp);`
`1258`	`1258`	`if (Zreplacement == NULL)`
`1259`	`1259`	`goto Done;`
	`1260`	`+ if (!PyString_Check(Zreplacement)) {`
	`1261`	`+ PyErr_SetString(PyExc_TypeError, "tzname.replace() did not return a string");`
	`1262`	`+ goto Done;`
	`1263`	`+ }`
`1260`	`1264`	`}`
`1261`	`1265`	`else`
`1262`	`1266`	`Py_DECREF(temp);`
`1263`	`1267`	`}`
`1264`	`1268`	`}`
`1265`	`1269`	`assert(Zreplacement != NULL);`
`1266`		`- ptoappend = PyString_AsString(Zreplacement);`
`1267`		`- ntoappend = PyString_Size(Zreplacement);`
	`1270`	`+ ptoappend = PyString_AS_STRING(Zreplacement);`
	`1271`	`+ ntoappend = PyString_GET_SIZE(Zreplacement);`
`1268`	`1272`	`}`
`1269`	`1273`	`else {`
`1270`	`1274`	`/* percent followed by neither z nor Z */`
`@@ -1275,6 +1279,7 @@ wrap_strftime(PyObject object, PyObject format, PyObject *timetuple,`
`1275`	`1279`	`/* Append the ntoappend chars starting at ptoappend to`
`1276`	`1280`	`* the new format.`
`1277`	`1281`	`*/`
	`1282`	`+ assert(ptoappend != NULL);`
`1278`	`1283`	`assert(ntoappend >= 0);`
`1279`	`1284`	`if (ntoappend == 0)`
`1280`	`1285`	`continue;`