]> granicus.if.org Git - python/commitdiff
bpo-38020: Fixes crash in os.readlink() on Windows (GH-15663)
authorSteve Dower <steve.dower@python.org>
Tue, 3 Sep 2019 19:50:51 +0000 (12:50 -0700)
committerGitHub <noreply@github.com>
Tue, 3 Sep 2019 19:50:51 +0000 (12:50 -0700)
Misc/NEWS.d/next/Windows/2019-09-03-11-47-37.bpo-38020.xFZ2j0.rst [new file with mode: 0644]
Modules/posixmodule.c

diff --git a/Misc/NEWS.d/next/Windows/2019-09-03-11-47-37.bpo-38020.xFZ2j0.rst b/Misc/NEWS.d/next/Windows/2019-09-03-11-47-37.bpo-38020.xFZ2j0.rst
new file mode 100644 (file)
index 0000000..e6ddaba
--- /dev/null
@@ -0,0 +1,2 @@
+Fixes potential crash when calling :func:`os.readlink` (or indirectly
+through :func:`~os.path.realpath`) on a file that is not a supported link.
index 2302678ccc14ce2b2858203d8cd940c5836ff851..c412d07a0e113c9716cdf3e4b8ce4a01d90b7694 100644 (file)
@@ -7818,7 +7818,7 @@ os_readlink_impl(PyObject *module, path_t *path, int dir_fd)
     HANDLE reparse_point_handle;
     char target_buffer[_Py_MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
     _Py_REPARSE_DATA_BUFFER *rdb = (_Py_REPARSE_DATA_BUFFER *)target_buffer;
-    PyObject *result;
+    PyObject *result = NULL;
 
     /* First get a handle to the reparse point */
     Py_BEGIN_ALLOW_THREADS
@@ -7872,7 +7872,7 @@ os_readlink_impl(PyObject *module, path_t *path, int dir_fd)
             name[1] = L'\\';
         }
         result = PyUnicode_FromWideChar(name, nameLen);
-        if (path->narrow) {
+        if (result && path->narrow) {
             Py_SETREF(result, PyUnicode_EncodeFSDefault(result));
         }
     }