Patches #925152, #1118602: Avoid reading after the end of the buffer

loewis · loewis · commit a9b1700bc8df · 2005-03-04T14:37:01.000Z
in pyexpat.GetInputContext. Will backport to 2.4. git-svn-id: http://svn.python.org/projects/python/trunk@38570 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -44,6 +44,9 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Patches #925152, #1118602: Avoid reading after the end of the buffer
+  in pyexpat.GetInputContext.
+
 - Patches #749830, #1144555: allow UNIX mmap size to default to current 
   file size.
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
@@ -1082,7 +1082,7 @@ xmlparse_GetInputContext(xmlparseobject *self, PyObject *args)
                 = XML_GetInputContext(self->itself, &offset, &size);
 
             if (buffer != NULL)
-                result = PyString_FromStringAndSize(buffer + offset, size);
+                result = PyString_FromStringAndSize(buffer + offset, size - offset);
             else {
                 result = Py_None;
                 Py_INCREF(result);
