Fix segfault when using shiboken.delete

When an object is deleted, invalidate / releaseWrapper needs to
be called before cptr array is deleted.

Change-Id: I82f71f569d5a0f52084fbe1cc3d7846e764c7ef6
Reviewed-by: John Cummings <jcummings2@users.sf.net>

1 files changed, 11 insertions, 1 deletions

diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp
index 63b46bcd5..55f96a391 100644
--- a/libshiboken/basewrapper.cpp
+++ b/libshiboken/basewrapper.cpp
@@ -823,9 +823,19 @@ void callCppDestructors(SbkObject* pyObj)
         threadSaver.save();
         sbkType->d->cpp_dtor(pyObj->d->cptr[0]);
     }
+
+    /* invalidate needs to be called before deleting pointer array because
+       it needs to delete entries for them from the BindingManager hash table;
+       also release wrapper explicitly if object contains C++ wrapper because
+       invalidate doesn't */
+    invalidate(pyObj);
+    if (pyObj->d->validCppObject && pyObj->d->containsCppWrapper) {
+      BindingManager::instance().releaseWrapper(pyObj);
+    }
+
     delete[] pyObj->d->cptr;
     pyObj->d->cptr = 0;
-    invalidate(pyObj);
+    pyObj->d->validCppObject = false;
 }
 
 bool hasOwnership(SbkObject* pyObj)