Neal Norwitz schrieb: > Should this fix be applied to head (trunk)? It's easier to make the > changes there for stuff like this (assuming that's the case) and let > it propagate. I'll pretty much sync at least once a week. I have a > reminder every Sunday.
Yes it should (as I noted in the commit message). What to do? Shall I apply the fix to the trunk and release25-maint branch, and revert it in the py3k-struni branch (to avoid merge conflicts), waiting for your merge to happen? The fix is not very critical since it is in an error condition that does not happen normally... Thomas > n > -- > > On 7/11/07, thomas.heller <python-3000-checkins@python.org> wrote: >> Author: thomas.heller >> Date: Wed Jul 11 14:18:46 2007 >> New Revision: 56257 >> >> Modified: >> python/branches/py3k-struni/Modules/_ctypes/stgdict.c >> Log: >> PyType_stgdict() returns a borrowed reference which must not be Py_DECREF'd. >> This bug should be fixed in trunk and release25-maint also. >> >> Modified: python/branches/py3k-struni/Modules/_ctypes/stgdict.c >> ============================================================================== >> --- python/branches/py3k-struni/Modules/_ctypes/stgdict.c (original) >> +++ python/branches/py3k-struni/Modules/_ctypes/stgdict.c Wed Jul 11 >> 14:18:46 2007 >> @@ -465,13 +465,11 @@ >> >> if (!prop) { >> Py_DECREF(pair); >> - Py_DECREF((PyObject *)stgdict); >> return -1; >> } >> if (-1 == PyDict_SetItem(realdict, name, prop)) { >> Py_DECREF(prop); >> Py_DECREF(pair); >> - Py_DECREF((PyObject *)stgdict); >> return -1; >> } >> Py_DECREF(pair); >> _______________________________________________ >> Python-3000-checkins mailing list >> Python-3000-checkins@python.org >> http://mail.python.org/mailman/listinfo/python-3000-checkins >> _______________________________________________ Python-3000-checkins mailing list Python-3000-checkins@python.org http://mail.python.org/mailman/listinfo/python-3000-checkins