Fix for Bug #216405:

use the correct base for a buffer object in _PyBuffer_FromObject.

1 files changed, 6 insertions, 4 deletions

diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index 242261f..57d031c 100644
--- a/Objects/bufferobject.c
+++ b/Objects/bufferobject.c
@@ -73,11 +73,13 @@ _PyBuffer_FromObject(PyObject *base, int offset, int size,
 		offset = count;
 	if ( offset + size > count )
 		size = count - offset;
-
-	/* if the base object is another buffer, then "deref" it */
-	if ( PyBuffer_Check(base) )
+	
+	/* if the base object is another buffer, then "deref" it,
+	 * except if the base of the other buffer is NULL
+	 */
+	if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) )
 		base = ((PyBufferObject *)base)->b_base;
-
+	
 	return _PyBuffer_FromMemory(base, (char *)p + offset, size, readonly);
 }