Move the checks to verify if an object is invalid to Shiboken::cppObjectIsInvalid function.

1 files changed, 5 insertions, 2 deletions

diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp
index a01fc57af..d2c541011 100644
--- a/libshiboken/basewrapper.cpp
+++ b/libshiboken/basewrapper.cpp
@@ -153,9 +153,12 @@ PyObject* SbkBaseWrapper_TpNew(PyTypeObject* subtype, PyObject*, PyObject*)
 
 bool cppObjectIsInvalid(PyObject* wrapper)
 {
-    if (wrapper == Py_None || ((Shiboken::SbkBaseWrapper*)wrapper)->validCppObject)
+    if (wrapper == Py_None
+        || wrapper->ob_type->ob_type != &Shiboken::SbkBaseWrapperType_Type
+        || ((Shiboken::SbkBaseWrapper*)wrapper)->validCppObject) {
         return false;
-    PyErr_SetString(PyExc_RuntimeError, "internal C++ object already deleted.");
+    }
+    PyErr_SetString(PyExc_RuntimeError, "Internal C++ object already deleted.");
     return true;
 }