Mercurial > cpython-lru_cache-weakref

diff Objects/object.c @ 8695:6d2168a9641f legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When comparing objects, always check that tp_compare is not NULL before calling it. This check was there when the objects were of the same type *before* coercion, but not if they initially differed but became the same *after* coercion.
author Guido van Rossum <guido@python.org>
date Tue, 21 Jul 1998 21:56:41 +0000
parents c555c72f090d
children 38560a3a3249
line wrap: on
line diff
--- a/Objects/object.c	Tue Jul 21 14:24:04 1998 +0000
+++ b/Objects/object.c	Tue Jul 21 21:56:41 1998 +0000
@@ -312,14 +312,18 @@
 	if ((vtp = v->ob_type) != (wtp = w->ob_type)) {
 		char *vname = vtp->tp_name;
 		char *wname = wtp->tp_name;
-		if (vtp->tp_as_number != NULL &&
-				wtp->tp_as_number != NULL) {
+		if (vtp->tp_as_number != NULL && wtp->tp_as_number != NULL) {
 			int err;
 			err = PyNumber_CoerceEx(&v, &w);
 			if (err < 0)
 				return -1;
 			else if (err == 0) {
-				int cmp = (*v->ob_type->tp_compare)(v, w);
+				int cmp;
+				vtp = v->ob_type;
+				if (vtp->tp_compare == NULL)
+					cmp = (v < w) ? -1 : 1;
+				else
+					cmp = (*vtp->tp_compare)(v, w);
 				Py_DECREF(v);
 				Py_DECREF(w);
 				return cmp;