SF 952807: Unpickling pickled instances of subclasses of datetime.date,

tim_one · tim_one · commit 435a68ea76f9 · 2004-06-07T23:04:33.000Z
datetime.datetime and datetime.time could yield insane objects. Thanks to Jiwon Seo for the fix. Bugfix candidate. I'll backport it to 2.3. git-svn-id: http://svn.python.org/projects/python/trunk@36119 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
@@ -510,6 +510,9 @@ def test_delta_non_days_ignored(self):
         dt2 = dt - delta
         self.assertEqual(dt2, dt - days)
 
+class SubclassDate(date):
+    sub_var = 1
+
 class TestDate(HarmlessMixedComparison):
     # Tests here should pass for both dates and datetimes, except for a
     # few tests that TestDateTime overrides.
@@ -1029,6 +1032,15 @@ def newmeth(self, start):
         self.assertEqual(dt1.toordinal(), dt2.toordinal())
         self.assertEqual(dt2.newmeth(-7), dt1.year + dt1.month - 7)
 
+    def test_pickling_subclass_date(self):
+
+        args = 6, 7, 23
+        orig = SubclassDate(*args)
+        for pickler, unpickler, proto in pickle_choices:
+            green = pickler.dumps(orig, proto)
+            derived = unpickler.loads(green)
+            self.assertEqual(orig, derived)
+
     def test_backdoor_resistance(self):
         # For fast unpickling, the constructor accepts a pickle string.
         # This is a low-overhead backdoor.  A user can (by intent or
@@ -1053,6 +1065,9 @@ def test_backdoor_resistance(self):
 #############################################################################
 # datetime tests
 
+class SubclassDatetime(datetime):
+    sub_var = 1
+
 class TestDateTime(TestDate):
 
     theclass = datetime
@@ -1296,6 +1311,14 @@ def test_more_pickling(self):
         self.assertEqual(b.month, 2)
         self.assertEqual(b.day, 7)
 
+    def test_pickling_subclass_datetime(self):
+        args = 6, 7, 23, 20, 59, 1, 64**2
+        orig = SubclassDatetime(*args)
+        for pickler, unpickler, proto in pickle_choices:
+            green = pickler.dumps(orig, proto)
+            derived = unpickler.loads(green)
+            self.assertEqual(orig, derived)
+
     def test_more_compare(self):
         # The test_compare() inherited from TestDate covers the error cases.
         # We just want to test lexicographic ordering on the members datetime
@@ -1500,6 +1523,9 @@ def newmeth(self, start):
         self.assertEqual(dt2.newmeth(-7), dt1.year + dt1.month +
                                           dt1.second - 7)
 
+class SubclassTime(time):
+    sub_var = 1
+
 class TestTime(HarmlessMixedComparison):
 
     theclass = time
@@ -1700,6 +1726,14 @@ def test_pickling(self):
             derived = unpickler.loads(green)
             self.assertEqual(orig, derived)
 
+    def test_pickling_subclass_time(self):
+        args = 20, 59, 16, 64**2
+        orig = SubclassTime(*args)
+        for pickler, unpickler, proto in pickle_choices:
+            green = pickler.dumps(orig, proto)
+            derived = unpickler.loads(green)
+            self.assertEqual(orig, derived)
+
     def test_bool(self):
         cls = self.theclass
         self.failUnless(cls(1))
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.4 alpha 1?
 Core and builtins
 -----------------
 
+- Bug #952807:  Unpickling pickled instances of subclasses of
+  datetime.date, datetime.datetime and datetime.time could yield insane
+  objects.  Thanks to Jiwon Seo for a fix.
+
 - Bug #845802: Python crashes when __init__.py is a directory.
 
 - Unicode objects received two new methods: iswide() and width().
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
@@ -2206,7 +2206,7 @@ date_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 	{
 	    	PyDateTime_Date *me;
 
-		me = PyObject_New(PyDateTime_Date, type);
+		me = (PyDateTime_Date *) (type->tp_alloc(type, 0));
 		if (me != NULL) {
 			char *pdata = PyString_AS_STRING(state);
 			memcpy(me->data, pdata, _PyDateTime_DATE_DATASIZE);
@@ -3049,8 +3049,7 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 			}
 		}
 		aware = (char)(tzinfo != Py_None);
-		me = (PyDateTime_Time *) time_alloc(&PyDateTime_TimeType,
-						    aware);
+		me = (PyDateTime_Time *) (type->tp_alloc(type, aware));
 		if (me != NULL) {
 			char *pdata = PyString_AS_STRING(state);
 
@@ -3572,9 +3571,7 @@ datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 			}
 		}
 		aware = (char)(tzinfo != Py_None);
-		me = (PyDateTime_DateTime *) datetime_alloc(
-						&PyDateTime_DateTimeType,
-				     		aware);
+		me = (PyDateTime_DateTime *) (type->tp_alloc(type , aware));
 		if (me != NULL) {
 			char *pdata = PyString_AS_STRING(state);
 

Original file line number	Diff line number	Diff line change
`@@ -2206,7 +2206,7 @@ date_new(PyTypeObject type, PyObject args, PyObject *kw)`
`2206`	`2206`	`{`
`2207`	`2207`	`PyDateTime_Date *me;`
`2208`	`2208`
`2209`		`- me = PyObject_New(PyDateTime_Date, type);`
	`2209`	`+ me = (PyDateTime_Date *) (type->tp_alloc(type, 0));`
`2210`	`2210`	`if (me != NULL) {`
`2211`	`2211`	`char *pdata = PyString_AS_STRING(state);`
`2212`	`2212`	`memcpy(me->data, pdata, _PyDateTime_DATE_DATASIZE);`
`@@ -3049,8 +3049,7 @@ time_new(PyTypeObject type, PyObject args, PyObject *kw)`
`3049`	`3049`	`}`
`3050`	`3050`	`}`
`3051`	`3051`	`aware = (char)(tzinfo != Py_None);`
`3052`		`- me = (PyDateTime_Time *) time_alloc(&PyDateTime_TimeType,`
`3053`		`- aware);`
	`3052`	`+ me = (PyDateTime_Time *) (type->tp_alloc(type, aware));`
`3054`	`3053`	`if (me != NULL) {`
`3055`	`3054`	`char *pdata = PyString_AS_STRING(state);`
`3056`	`3055`
`@@ -3572,9 +3571,7 @@ datetime_new(PyTypeObject type, PyObject args, PyObject *kw)`
`3572`	`3571`	`}`
`3573`	`3572`	`}`
`3574`	`3573`	`aware = (char)(tzinfo != Py_None);`
`3575`		`- me = (PyDateTime_DateTime *) datetime_alloc(`
`3576`		`- &PyDateTime_DateTimeType,`
`3577`		`- aware);`
	`3574`	`+ me = (PyDateTime_DateTime *) (type->tp_alloc(type , aware));`
`3578`	`3575`	`if (me != NULL) {`
`3579`	`3576`	`char *pdata = PyString_AS_STRING(state);`
`3580`	`3577`