From 5e684339c23a6bcac8896a5d25549dbe9d7b8aa6 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Fri, 6 Aug 2010 09:44:48 +0000 Subject: [PATCH] Merged revisions 83751-83752 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83751 | mark.dickinson | 2010-08-06 10:36:57 +0100 (Fri, 06 Aug 2010) | 1 line Issue #9526: Remove outdated casts to int that were preventing the array module from working correctly with arrays > 2GB. ........ r83752 | mark.dickinson | 2010-08-06 10:38:58 +0100 (Fri, 06 Aug 2010) | 1 line Misc/NEWS entry for r83751. ........ --- Misc/NEWS | 4 ++++ Modules/arraymodule.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index c844ebff77..af440f0cdf 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -142,6 +142,10 @@ Library Extension Modules ----------------- +- Issue #9526: Remove some outdated (int) casts that were preventing + the array module from working correctly with arrays of more than + 2**31 elements. + - Fix memory leak in ssl._ssl._test_decode_cert. - Issue #8065: Fix memory leak in readline module (from failure to diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index 5b37896a14..1602e4883d 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -798,7 +798,7 @@ array_iter_extend(arrayobject *self, PyObject *bb) return -1; while ((v = PyIter_Next(it)) != NULL) { - if (ins1(self, (int) Py_SIZE(self), v) != 0) { + if (ins1(self, Py_SIZE(self), v) != 0) { Py_DECREF(v); Py_DECREF(it); return -1; @@ -1090,7 +1090,7 @@ the buffer length in bytes."); static PyObject * array_append(arrayobject *self, PyObject *v) { - return ins(self, (int) Py_SIZE(self), v); + return ins(self, Py_SIZE(self), v); } PyDoc_STRVAR(append_doc, -- 2.50.1