Add asserts to PyBytes_AS_STRING and PyBytes_GET_SIZE.

guido.van.rossum · guido.van.rossum · commit fea60ffc9914 · 2007-06-14T00:31:21.000Z
git-svn-id: http://svn.python.org/projects/python/branches/py3k-struni@55970 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Include/bytesobject.h b/Include/bytesobject.h
@@ -41,8 +41,8 @@ PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
 PyAPI_FUNC(int) PyBytes_Resize(PyObject *, Py_ssize_t);
 
 /* Macros, trading safety for speed */
-#define PyBytes_AS_STRING(self) (((PyBytesObject *)(self))->ob_bytes)
-#define PyBytes_GET_SIZE(self)  (((PyBytesObject *)(self))->ob_size)
+#define PyBytes_AS_STRING(self) (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_bytes)
+#define PyBytes_GET_SIZE(self)  (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_size)
 
 #ifdef __cplusplus
 }

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ PyAPI_FUNC(char ) PyBytes_AsString(PyObject );`
`41`	`41`	`PyAPI_FUNC(int) PyBytes_Resize(PyObject *, Py_ssize_t);`
`42`	`42`
`43`	`43`	`/* Macros, trading safety for speed */`
`44`		`-#define PyBytes_AS_STRING(self) (((PyBytesObject *)(self))->ob_bytes)`
`45`		`-#define PyBytes_GET_SIZE(self) (((PyBytesObject *)(self))->ob_size)`
	`44`	`+#define PyBytes_AS_STRING(self) (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_bytes)`
	`45`	`+#define PyBytes_GET_SIZE(self) (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_size)`
`46`	`46`
`47`	`47`	`#ifdef __cplusplus`
`48`	`48`	`}`