File 0113-erts-Fix-memory-leak-in-efile_read_handle_... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0113-erts-Fix-memory-leak-in-efile_read_handle_info-on-Wi.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Currently displaying revision 0e04b8d79a55adf8ba49c177393a4846 , Show latest

From a1eefceba24bfbc83d0f48047de7628fccf454a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Fri, 17 Dec 2021 17:29:24 +0100
Subject: [PATCH] erts: Fix memory leak in efile_read_handle_info on Windows

---
 erts/emulator/nifs/win32/win_prim_file.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/erts/emulator/nifs/win32/win_prim_file.c b/erts/emulator/nifs/win32/win_prim_file.c
index a6c08c4162..2ff433d49f 100644
--- a/erts/emulator/nifs/win32/win_prim_file.c
+++ b/erts/emulator/nifs/win32/win_prim_file.c
@@ -893,11 +893,12 @@ posix_errno_t efile_read_info(const efile_path_t *path, int follow_links, efile_
 
             CloseHandle(handle);
 
-            if(posix_errno != 0) {
-                return posix_errno;
+            if(posix_errno == 0) {
+                posix_errno = efile_read_info(&resolved_path, 0, result);
+                enif_release_binary(&resolved_path);
             }
 
-            return efile_read_info(&resolved_path, 0, result);
+            return posix_errno;
         }
 
         GetFileInformationByHandle(handle, &native_file_info);
@@ -928,17 +929,20 @@ posix_errno_t efile_read_handle_info(efile_data_t *d, efile_fileinfo_t *result)
 
     if(GetFileInformationByHandle(w->handle, &native_file_info)) {
         build_file_info_times(&native_file_info, result);
+        build_file_info(&native_file_info, &path, 0, result);
+
+        posix_errno = 0;
     } else if(is_path_root(&path)) {
         /* GetFileInformationByHandle is not supported on path roots, so
          * fall back to efile_read_info. */
-        return efile_read_info(&path, 0, result);
+        posix_errno = efile_read_info(&path, 0, result);
     } else {
-        return windows_to_posix_errno(GetLastError());
+        posix_errno = windows_to_posix_errno(GetLastError());
     }
 
-    build_file_info(&native_file_info, &path, 0, result);
+    enif_release_binary(&path);
 
-    return 0;
+    return posix_errno;
 }
 
 posix_errno_t efile_set_permissions(const efile_path_t *path, Uint32 permissions) {
-- 
2.31.1

Places

File 0113-erts-Fix-memory-leak-in-efile_read_handle_info-on-Wi.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Places