Added pointer validation to memory.make_object()

Ayuto · Ayuto · commit dcc106be14d2 · 2015-07-30T21:30:36.000+02:00
diff --git a/src/core/modules/memory/memory_tools.h b/src/core/modules/memory/memory_tools.h
@@ -54,6 +54,9 @@ inline object MakeObject(object cls, CPointer* pPtr)
 	if (!PyObject_HasAttrString(cls.ptr(), GET_OBJ_NAME))
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Unable to make an object using this class.");
 
+	if (!pPtr->IsValid())
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Pointer is NULL.");
+
 	return cls.attr(GET_OBJ_NAME)(ptr(pPtr));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ inline object MakeObject(object cls, CPointer* pPtr)`
`54`	`54`	`if (!PyObject_HasAttrString(cls.ptr(), GET_OBJ_NAME))`
`55`	`55`	`BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Unable to make an object using this class.");`
`56`	`56`
	`57`	`+ if (!pPtr->IsValid())`
	`58`	`+ BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Pointer is NULL.");`
	`59`	`+`
`57`	`60`	`return cls.attr(GET_OBJ_NAME)(ptr(pPtr));`
`58`	`61`	`}`
`59`	`62`