commit 07298a1f0434950c927f5d459fe611f73bb6d262
author Victor Stinner <victor.stinner@haypocalc.com> Mon Oct 18 22:45:54 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Mon Oct 18 22:45:54 2010 +0000
tree 5f15ce0df9da309c96486267a08a430268b5b4e5
parent 9e40fad193d8d8365215cf0c23fed990ff0bed9b

zipimport: remove arbitrary length limit from message formats

PyErr_Format() and PyUnicode_FromFormat() are able to allocate the right buffer
size and to catch memory allocation failures.

Modules/zipimport.c

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index ac6d45e..ba449c0 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -194,10 +194,10 @@
     if (self->archive == NULL)
         return PyUnicode_FromString("<zipimporter object \"???\">");
     else if (self->prefix != NULL && PyUnicode_GET_SIZE(self->prefix) != 0)
-        return PyUnicode_FromFormat("<zipimporter object \"%.300U%c%.150U\">",
+        return PyUnicode_FromFormat("<zipimporter object \"%U%c%U\">",
                                     self->archive, SEP, self->prefix);
     else
-        return PyUnicode_FromFormat("<zipimporter object \"%.300U\">",
+        return PyUnicode_FromFormat("<zipimporter object \"%U\">",
                                     self->archive);
 }
 
@@ -415,8 +415,7 @@
     if (mi == MI_ERROR)
         return NULL;
     if (mi == MI_NOT_FOUND) {
-        PyErr_Format(ZipImportError, "can't find module '%.200s'",
-                     fullname);
+        PyErr_Format(ZipImportError, "can't find module '%s'", fullname);
         return NULL;
     }
     return PyBool_FromLong(mi == MI_PACKAGE);
@@ -502,8 +501,7 @@
     if (mi == MI_ERROR)
         return NULL;
     if (mi == MI_NOT_FOUND) {
-        PyErr_Format(ZipImportError, "can't find module '%.200s'",
-                     fullname);
+        PyErr_Format(ZipImportError, "can't find module '%s'", fullname);
         return NULL;
     }
     subname = get_subname(fullname);
@@ -737,23 +735,20 @@
 
     fp = _Py_fopen(archive_obj, "rb");
     if (fp == NULL) {
-        PyErr_Format(ZipImportError, "can't open Zip file: "
-                     "'%.200U'", archive_obj);
+        PyErr_Format(ZipImportError, "can't open Zip file: '%U'", archive_obj);
         return NULL;
     }
     fseek(fp, -22, SEEK_END);
     header_position = ftell(fp);
     if (fread(endof_central_dir, 1, 22, fp) != 22) {
         fclose(fp);
-        PyErr_Format(ZipImportError, "can't read Zip file: "
-                     "'%.200U'", archive_obj);
+        PyErr_Format(ZipImportError, "can't read Zip file: '%U'", archive_obj);
         return NULL;
     }
     if (get_long((unsigned char *)endof_central_dir) != 0x06054B50) {
         /* Bad: End of Central Dir signature */
         fclose(fp);
-        PyErr_Format(ZipImportError, "not a Zip file: "
-                     "'%.200U'", archive_obj);
+        PyErr_Format(ZipImportError, "not a Zip file: '%U'", archive_obj);
         return NULL;
     }
 
@@ -1021,7 +1016,7 @@
     if (!PyCode_Check(code)) {
         Py_DECREF(code);
         PyErr_Format(PyExc_TypeError,
-             "compiled module %.200s is not a code object",
+             "compiled module %s is not a code object",
              pathname);
         return NULL;
     }
@@ -1209,7 +1204,7 @@
             return code;
         }
     }
-    PyErr_Format(ZipImportError, "can't find module '%.200s'", fullname);
+    PyErr_Format(ZipImportError, "can't find module '%s'", fullname);
     return NULL;
 }