diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 4b4dbbaf595..26a43be875b 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -664,69 +664,80 @@ static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end)
     return dst;
 }
 
-/******************************************************************
- *		image_locate_build_id_target
- *
- * Try to find the .so file containing the debug info out of the build-id note information
- */
-static struct image_file_map* image_locate_build_id_target(const BYTE* id, unsigned idlen)
+static BOOL image_locate_build_id_target_in_dir(struct image_file_map *fmap_link, const BYTE* id, unsigned idlen, const WCHAR *from)
 {
-    struct image_file_map* fmap_link = NULL;
-    DWORD sz;
-    WCHAR* p;
-    WCHAR* z;
+    size_t from_len = wcslen(from);
+    BOOL found = FALSE;
+    WCHAR *p, *z;
 
-    fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link));
-    if (!fmap_link) return NULL;
-
-    p = malloc(sizeof(L"/usr/lib/debug/.build-id/") +
-               (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug"));
-    if (!p) goto fail;
-    wcscpy(p, L"/usr/lib/debug/.build-id/");
-    z = p + wcslen(p);
-    if (idlen)
+    if ((p = malloc((from_len + idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug"))))
     {
+        memcpy(p, from, from_len * sizeof(WCHAR));
+        z = p + from_len;
         z = append_hex(z, id, id + 1);
         if (idlen > 1)
         {
             *z++ = L'/';
             z = append_hex(z, id + 1, id + idlen);
         }
-    }
-    wcscpy(z, L".debug");
-    TRACE("checking %s\n", debugstr_w(p));
-
-    if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen))
-    {
+        *z = L'\0';
+        TRACE("checking %s\n", debugstr_w(p));
+        found = image_check_debug_link_gnu_id(p, fmap_link, id, idlen);
+        if (!found)
+        {
+            wcscpy(z, L".debug");
+            TRACE("checking %s\n", debugstr_w(p));
+            found = image_check_debug_link_gnu_id(p, fmap_link, id, idlen);
+        }
         free(p);
-        return fmap_link;
     }
+    return found;
+}
+
+/******************************************************************
+ *		image_locate_build_id_target
+ *
+ * Try to find an image file containing the debug info out of the build-id
+ * note information.
+ */
+static struct image_file_map* image_locate_build_id_target(const BYTE* id, unsigned idlen)
+{
+    struct image_file_map* fmap_link;
+    DWORD sz;
+
+    if (!idlen) return NULL;
+
+    if (!(fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link))))
+        return NULL;
+    if (image_locate_build_id_target_in_dir(fmap_link, id, idlen, L"/usr/lib/debug/.build-id/"))
+        return fmap_link;
+    if (image_locate_build_id_target_in_dir(fmap_link, id, idlen, L"/usr/lib/.build-id/"))
+        return fmap_link;
 
     sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0);
     if (sz)
     {
-        z = realloc(p, sz * sizeof(WCHAR) +
-                    sizeof(L"\\.cache\\debuginfod_client\\") +
-                    idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500);
-        if (!z) goto fail;
-        p = z;
-        GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz);
-        z = p + sz - 1;
-        wcscpy(z, L"\\.cache\\debuginfod_client\\");
-        z += wcslen(z);
-        z = append_hex(z, id, id + idlen);
-        wcscpy(z, L"\\debuginfo");
-        TRACE("checking %ls\n", p);
-        if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen))
+        WCHAR *p, *z;
+        p = malloc(sz * sizeof(WCHAR) +
+                   sizeof(L"\\.cache\\debuginfod_client\\") +
+                   idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500);
+        if (p && GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz) == sz - 1)
         {
+            BOOL found;
+
+            wcscpy(p + sz - 1, L"\\.cache\\debuginfod_client\\");
+            z = p + wcslen(p);
+            z = append_hex(z, id, id + idlen);
+            wcscpy(z, L"\\debuginfo");
+            TRACE("checking %ls\n", p);
+            found = image_check_debug_link_gnu_id(p, fmap_link, id, idlen);
             free(p);
-            return fmap_link;
+            if (found) return fmap_link;
         }
     }
 
     TRACE("not found\n");
-fail:
-    free(p);
+
     HeapFree(GetProcessHeap(), 0, fmap_link);
     return NULL;
 }