From 925ef39949b784d331dbb246b8888347ecd8b275 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 20 Jun 2011 15:01:10 +0200
Subject: find_module_path_list() fails if _Py_fopen() failed and raised an
 exception (UnicodeEncodeError).

---
 Python/import.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Python/import.c b/Python/import.c
index 9ec8cd8..de5dc0c 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1908,6 +1908,10 @@ find_module_path_list(PyObject *fullname, PyObject *name,
             fp = _Py_fopen(filename, filemode);
             if (fp == NULL) {
                 Py_DECREF(filename);
+                if (PyErr_Occurred()) {
+                    Py_DECREF(prefix);
+                    return NULL;
+                }
                 continue;
             }
             match = case_ok(filename, -(Py_ssize_t)strlen(fdp->suffix), name);
-- 
cgit v0.12