[PATCH 0/1] MR6984: msvcrt: Don't leak find handle or error in _findfirst().

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6984

[PATCH 1/1] msvcrt: Don't leak find handle or error in _findfirst().

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/msvcrt/dir.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 7a36b74ee6b..a047ca47aab 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -391,7 +391,11 @@ intptr_t CDECL _findfirst32(const char *fspec, struct _finddata32_t *ft)
     if (fspec && !(fspecW = wstrdupa_utf8(fspec))) return -1;
     ret = _wfindfirst32(fspecW, &wft);
     free(fspecW);
-    if (!finddata32_wtoa(&wft, ft)) return -1;
+    if (ret != -1 && !finddata32_wtoa(&wft, ft))
+    {
+        _findclose(ret);
+        return -1;
+    }
     return ret;
 }
 
@@ -461,7 +465,11 @@ intptr_t CDECL _findfirst64(const char *fspec, struct _finddata64_t *ft)
     if (fspec && !(fspecW = wstrdupa_utf8(fspec))) return -1;
     ret = _wfindfirst64(fspecW, &wft);
     free(fspecW);
-    if (!finddata64_wtoa(&wft, ft)) return -1;
+    if (ret != -1 && !finddata64_wtoa(&wft, ft))
+    {
+        _findclose(ret);
+        return -1;
+    }
     return ret;
 }
 
@@ -510,7 +518,11 @@ intptr_t CDECL _findfirst64i32(const char *fspec, struct _finddata64i32_t *ft)
     if (fspec && !(fspecW = wstrdupa_utf8(fspec))) return -1;
     ret = _wfindfirst64i32(fspecW, &wft);
     free(fspecW);
-    if (!finddata64i32_wtoa(&wft, ft)) return -1;
+    if (ret != -1 && !finddata64i32_wtoa(&wft, ft))
+    {
+        _findclose(ret);
+        return -1;
+    }
     return ret;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6984