Closes #15973: fix a segmentation fault when comparing timezone objects.

birkenfeld · birkenfeld · commit 0085a2407574 · 2012-09-22T09:23:12.000+02:00
diff --git a/Lib/datetime.py b/Lib/datetime.py
@@ -1854,6 +1854,8 @@ def __getinitargs__(self):
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
@@ -235,6 +235,8 @@ def test_comparison(self):
         self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
+        self.assertTrue(timezone(ZERO) != None)
+        self.assertFalse(timezone(ZERO) ==  None)
 
     def test_aware_datetime(self):
         # test that timezone instances can be used by datetime
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -31,6 +31,9 @@ Library
 Extension Modules
 -----------------
 
+- Issue #15973: Fix a segmentation fault when comparing datetime timezone
+  objects.
+
 - Issue #15977: Fix memory leak in Modules/_ssl.c when the function
   _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
 
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -3215,6 +3215,12 @@ timezone_richcompare(PyDateTime_TimeZone *self,
 {
     if (op != Py_EQ && op != Py_NE)
         Py_RETURN_NOTIMPLEMENTED;
+    if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
+	if (op == Py_EQ)
+	    Py_RETURN_FALSE;
+	else
+	    Py_RETURN_TRUE;
+    }
     return delta_richcompare(self->offset, other->offset, op);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3215,6 +3215,12 @@ timezone_richcompare(PyDateTime_TimeZone *self,`
`3215`	`3215`	`{`
`3216`	`3216`	`if (op != Py_EQ && op != Py_NE)`
`3217`	`3217`	`Py_RETURN_NOTIMPLEMENTED;`
	`3218`	`+ if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {`
	`3219`	`+ if (op == Py_EQ)`
	`3220`	`+ Py_RETURN_FALSE;`
	`3221`	`+ else`
	`3222`	`+ Py_RETURN_TRUE;`
	`3223`	`+ }`
`3218`	`3224`	`return delta_richcompare(self->offset, other->offset, op);`
`3219`	`3225`	`}`
`3220`	`3226`