[PATCH 0/1] MR4848: dbghelp: {stabs} Support redefinition of a range statement.

[eric pouech (＠epo)]

Wine-Bug-Id: https://bugs.winehq.org/show_bug.cgi?id=56168

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>

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

[PATCH 1/1] dbghelp: {stabs} Support redefinition of a range statement.

[Eric Pouech]

From: Eric Pouech <epouech(a)codeweavers.com>

Wine-Bug-Id: https://bugs.winehq.org/show_bug.cgi?id=56168

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>
---
 dlls/dbghelp/stabs.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 552b334f2da..20d5623f391 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -819,9 +819,15 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ
 	    PTS_ABORTIF(ptd, stabs_pts_read_array(ptd, &new_dt) == -1);
 	    break;
 	case 'r':
-	    PTS_ABORTIF(ptd, stabs_pts_read_range(ptd, typename, &new_dt) == -1);
-	    assert(!*stabs_find_ref(filenr1, subnr1));
-	    *stabs_find_ref(filenr1, subnr1) = new_dt;
+            {
+                struct symt**       prev_dt;
+                PTS_ABORTIF(ptd, stabs_pts_read_range(ptd, typename, &new_dt) == -1);
+
+                prev_dt = stabs_find_ref(filenr1, subnr1);
+                /* allow redefining with same base type */
+                if (*prev_dt && *prev_dt != new_dt) WARN("Multiple range def in %ls\n", ptd->module->module.ModuleName);
+                else *prev_dt = new_dt;
+            }
 	    break;
 	case 'f':
 	    PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1);
-- 
GitLab

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