merge 3.5

benjaminp · benjaminp · commit e4c222c040eb · 2016-10-05T23:32:15.000-07:00
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -267,7 +267,7 @@ static PyObject *
 mmap_read_method(mmap_object *self,
                  PyObject *args)
 {
-    Py_ssize_t num_bytes, remaining;
+    Py_ssize_t num_bytes = PY_SSIZE_T_MAX, remaining;
     PyObject *result;
 
     CHECK_VALID(NULL);

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ static PyObject *`
`267`	`267`	`mmap_read_method(mmap_object *self,`
`268`	`268`	`PyObject *args)`
`269`	`269`	`{`
`270`		`- Py_ssize_t num_bytes, remaining;`
	`270`	`+ Py_ssize_t num_bytes = PY_SSIZE_T_MAX, remaining;`
`271`	`271`	`PyObject *result;`
`272`	`272`
`273`	`273`	`CHECK_VALID(NULL);`