Index: Objects/object.c
===================================================================
--- Objects/object.c	(revision 60223)
+++ Objects/object.c	(working copy)
@@ -1349,12 +1349,15 @@
 		dictptr = (PyObject **) ((char *)obj + dictoffset);
 		dict = *dictptr;
 		if (dict != NULL) {
+			Py_INCREF(dict);
 			res = PyDict_GetItem(dict, name);
 			if (res != NULL) {
 				Py_INCREF(res);
 				Py_XDECREF(descr);
+                                Py_DECREF(dict);
 				goto done;
 			}
+                        Py_DECREF(dict);
 		}
 	}
 
@@ -1435,12 +1438,14 @@
 			*dictptr = dict;
 		}
 		if (dict != NULL) {
+			Py_INCREF(dict);
 			if (value == NULL)
 				res = PyDict_DelItem(dict, name);
 			else
 				res = PyDict_SetItem(dict, name, value);
 			if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
 				PyErr_SetObject(PyExc_AttributeError, name);
+			Py_DECREF(dict);
 			goto done;
 		}
 	}
Index: Objects/typeobject.c
===================================================================
--- Objects/typeobject.c	(revision 60223)
+++ Objects/typeobject.c	(working copy)
@@ -862,8 +862,8 @@
 		if (dictptr != NULL) {
 			PyObject *dict = *dictptr;
 			if (dict != NULL) {
+				*dictptr = NULL;
 				Py_DECREF(dict);
-				*dictptr = NULL;
 			}
 		}
 	}