From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 28 Aug 2001 22:08:34 +0000 (+0000)
Subject: load_int:  The fallback to long ints was coded in such a way that it
X-Git-Tag: v2.2a3~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12778e314b884be72dba30145aff6ce8d0156344;p=thirdparty%2FPython%2Fcpython.git

load_int:  The fallback to long ints was coded in such a way that it
couldn't succeed.  Fixed.
---

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 2b058ef44638..60aee6bbb68f 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -2542,10 +2542,9 @@ load_int(Unpicklerobject *self) {
     if (errno || (*endptr != '\n') || (endptr[1] != '\0')) {
         /* Hm, maybe we've got something long.  Let's try reading
            it as a Python long object. */
-        errno=0;
-        UNLESS (py_int=PyLong_FromString(s,&endptr,0)) goto finally;
-
-        if ((*endptr != '\n') || (endptr[1] != '\0')) {
+        errno = 0;
+        py_int = PyLong_FromString(s, NULL, 0);
+        if (py_int == NULL) {
             PyErr_SetString(PyExc_ValueError,
                             "could not convert string to int");
             goto finally;