Fix for Bug #216405:

use the correct base for a buffer object in _PyBuffer_FromObject.

diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index 242261f7187634366a47381b498dc5e14dda8da4..57d031cade56824b0a51304ce9541b73f063aa83 100644 (file)
--- 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);
 }