From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 15 Oct 2010 12:48:01 +0000 (+0000)
Subject: imp.load_dynamic() uses PyUnicode_FSConverter() to support surrogates
X-Git-Tag: v3.2a4~572
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dbf629bbd678da2e818bf404657fadba6dfa23f;p=thirdparty%2FPython%2Fcpython.git

imp.load_dynamic() uses PyUnicode_FSConverter() to support surrogates
in the library path.
---

diff --git a/Python/import.c b/Python/import.c
index 48fd20594d51..b8bcabda2828 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -3326,24 +3326,24 @@ static PyObject *
 imp_load_dynamic(PyObject *self, PyObject *args)
 {
     char *name;
+    PyObject *pathbytes;
     char *pathname;
     PyObject *fob = NULL;
     PyObject *m;
     FILE *fp = NULL;
-    if (!PyArg_ParseTuple(args, "ses|O:load_dynamic",
-                          &name,
-                          Py_FileSystemDefaultEncoding, &pathname,
-                          &fob))
+    if (!PyArg_ParseTuple(args, "sO&|O:load_dynamic",
+                          &name, PyUnicode_FSConverter, &pathbytes, &fob))
         return NULL;
+    pathname = PyBytes_AS_STRING(pathbytes);
     if (fob) {
         fp = get_file(pathname, fob, "r");
         if (fp == NULL) {
-            PyMem_Free(pathname);
+            Py_DECREF(pathbytes);
             return NULL;
         }
     }
     m = _PyImport_LoadDynamicModule(name, pathname, fp);
-    PyMem_Free(pathname);
+    Py_DECREF(pathbytes);
     if (fp)
         fclose(fp);
     return m;