From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Fri, 22 Dec 2023 19:16:04 +0000 (+0100)
Subject: Skip updating rodata avma and tracing when there are non-contiguous rodata sections.
X-Git-Tag: VALGRIND_3_23_0~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5b7c187b72a55fdf329973f213688bf55e9607b;p=thirdparty%2Fvalgrind.git

Skip updating rodata avma and tracing when there are non-contiguous rodata sections.
---

diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index db523230b7..16b5340a53 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -2495,6 +2495,7 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di )
                             name,
                             di->rodata_avma,
                             di->rodata_avma + di->rodata_size - 1);
+               goto out_rodata;
             }
          }
          if (inrx) {
@@ -2518,6 +2519,7 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di )
          TRACE_SYMTAB("acquiring .rodata bias = %#lx\n",
                       (UWord)di->rodata_bias);
       }
+  out_rodata:
 
       if (0 == VG_(strcmp)(name, ".dynbss")) {
          if (inrw1 && !di->bss_present) {