Eric Pouech : dbghelp/dwarf: Bump max supported version (by default) up to 4.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9768ea5637ea70befab5d61330d106a62a5a9c33
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9768ea5637ea70befab5d6133...

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Tue Sep 28 17:21:37 2021 +0200

dbghelp/dwarf: Bump max supported version (by default) up to 4.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dbghelp/dwarf.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 51789f8591e..430544196c5 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -2710,18 +2710,14 @@ static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx,
     if (max_supported_dwarf_version == 0)
     {
         char* env = getenv("DBGHELP_DWARF_VERSION");
-        LONG v = env ? atol(env) : 2;
-        max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2;
+        LONG v = env ? atol(env) : 4;
+        max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 4;
     }
 
     if (ctx->head.version < 2 || ctx->head.version > max_supported_dwarf_version)
     {
-        if (max_supported_dwarf_version > 2)
-            WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2 up to %u.\n",
-                 ctx->head.version, max_supported_dwarf_version);
-        else
-            WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n",
-                 ctx->head.version);
+        WARN("DWARF version %d isn't supported. Wine dbghelp only supports DWARF 2 up to %u.\n",
+             ctx->head.version, max_supported_dwarf_version);
         return FALSE;
     }