From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 22 Feb 2012 17:05:43 +0000 (+0100)
Subject: Issue #14084: Fix a file descriptor leak when importing a module with a bad encoding.
X-Git-Tag: v3.2.3rc1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f22a8d739494d188ba0b4430ca86d93e1ed30d2;p=thirdparty%2FPython%2Fcpython.git

Issue #14084: Fix a file descriptor leak when importing a module with a bad encoding.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index ee4287bebc9f..eeab400741db 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.3?
 Core and Builtins
 -----------------
 
+- Issue #14084: Fix a file descriptor leak when importing a module with a
+  bad encoding.
+
 - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
   environment variable, to provide an opt-in way to protect against denial of
   service attacks due to hash collisions within the dict and set types.  Patch
diff --git a/Python/import.c b/Python/import.c
index e5581c5bba13..f443ab85116b 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -3195,8 +3195,10 @@ call_find_module(char *name, PyObject *path)
                memory. */
             found_encoding = PyTokenizer_FindEncoding(fd);
             lseek(fd, 0, 0); /* Reset position */
-            if (found_encoding == NULL && PyErr_Occurred())
+            if (found_encoding == NULL && PyErr_Occurred()) {
+                close(fd);
                 return NULL;
+            }
             encoding = (found_encoding != NULL) ? found_encoding :
                    (char*)PyUnicode_GetDefaultEncoding();
         }