From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 3 Mar 2010 00:50:12 +0000 (+0000)
Subject: Merged revisions 78610 via svnmerge from
X-Git-Tag: v3.2a1~1585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f3216a06998e4a20041754ed902367eff1c9cb7;p=python

Merged revisions 78610 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78610 | victor.stinner | 2010-03-03 01:43:44 +0100 (mer., 03 mars 2010) | 3 lines

  Issue #3299: fix thread.allocate_lock() error handler, replace PyObject_Del()
  by Py_DECREF() to fix a crash in pydebug mode.
........
---

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index aff755e4ac..aab7ab16ff 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -27,14 +27,15 @@ typedef struct {
 static void
 lock_dealloc(lockobject *self)
 {
-	assert(self->lock_lock);
 	if (self->in_weakreflist != NULL)
 		PyObject_ClearWeakRefs((PyObject *) self);
-	/* Unlock the lock so it's safe to free it */
-	PyThread_acquire_lock(self->lock_lock, 0);
-	PyThread_release_lock(self->lock_lock);
-	
-	PyThread_free_lock(self->lock_lock);
+	if (self->lock_lock != NULL) {
+		/* Unlock the lock so it's safe to free it */
+		PyThread_acquire_lock(self->lock_lock, 0);
+		PyThread_release_lock(self->lock_lock);
+		
+		PyThread_free_lock(self->lock_lock);
+	}
 	PyObject_Del(self);
 }
 
@@ -432,9 +433,9 @@ newlockobject(void)
 	self->lock_lock = PyThread_allocate_lock();
 	self->in_weakreflist = NULL;
 	if (self->lock_lock == NULL) {
-		PyObject_Del(self);
-		self = NULL;
+		Py_DECREF(self);
 		PyErr_SetString(ThreadError, "can't allocate lock");
+		return NULL;
 	}
 	return self;
 }