[PATCH 0/1] MR9948: fix: prevent null pointer dereference in directory scanning

[Jiajin Cui (＠jin-king1)]

Signed-off-by: Jiajin Cui <[e-mail]>

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

[PATCH 1/1] fix: prevent null pointer dereference in directory scanning

[Jiajin Cui]

From: Jiajin Cui <[e-mail]>

Signed-off-by: Jiajin Cui <[e-mail]>
---
 dlls/ntdll/unix/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 42c82531051..488de37b508 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -2843,7 +2843,7 @@ static unsigned int get_cached_dir_data( HANDLE handle, struct dir_data **data_r
     }
 
     *data_ret = dir_data_cache[entry];
-    if (restart_scan) (*data_ret)->pos = 0;
+    if (restart_scan && *data_ret) (*data_ret)->pos = 0;
     return status;
 }
 
-- 
GitLab

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

[PATCH 0/1] MR9948: ntdll: prevent null pointer dereference in directory scanning

[Jinoh Kang (＠iamahuman)]

Could you add tests?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9948#note_127683

[PATCH 0/1] MR9948: ntdll: prevent null pointer dereference in directory scanning - approved

[Jinoh Kang (＠iamahuman)]

This merge request was approved by Jinoh Kang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9948