Ticket #34816: gfk-crash.patch

django/contrib/contenttypes/fields.py

@@ -242 +242 @@
             ct_match = (
                 ct_id == self.get_content_type(obj=rel_obj, using=instance._state.db).id
             )
-            pk_match = rel_obj._meta.pk.to_python(pk_val) == rel_obj.pk
-            if ct_match and pk_match:
-                return rel_obj
-            else:
-                rel_obj = None
+            if ct_match:
+                pk_match = rel_obj._meta.pk.to_python(pk_val) == rel_obj.pk
+                if pk_match:
+                    return rel_obj
+            rel_obj = None
         if ct_id is not None:
             ct = self.get_content_type(id=ct_id, using=instance._state.db)
             try: