diff options
| author | Brett Cannon <brett@python.org> | 2012-03-06 15:33:24 -0500 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-03-06 15:33:24 -0500 |
| commit | f67e494ca8dfc72c0f812ed46c6a08ad3b9ddc24 (patch) | |
| tree | ceed84488164142e5884411566de19f66702c3e7 /Objects/memoryobject.c | |
| parent | 0d4d410b2d6891520b1772a85f5ebdf926a0c77e (diff) | |
| parent | 0119e4753eec50f671ee716af202b4a1ca28deef (diff) | |
| download | cpython-git-f67e494ca8dfc72c0f812ed46c6a08ad3b9ddc24.tar.gz | |
merge
Diffstat (limited to 'Objects/memoryobject.c')
| -rw-r--r-- | Objects/memoryobject.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index e87abf5497..67f7e01fe2 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -86,14 +86,11 @@ _PyManagedBuffer_FromObject(PyObject *base) return NULL; if (PyObject_GetBuffer(base, &mbuf->master, PyBUF_FULL_RO) < 0) { - /* mbuf->master.obj must be NULL. */ + mbuf->master.obj = NULL; Py_DECREF(mbuf); return NULL; } - /* Assume that master.obj is a new reference to base. */ - assert(mbuf->master.obj == base); - return (PyObject *)mbuf; } |