[Backport 3.4] Fix C level backtraces for USE_ELF

composerinteralia · composerinteralia · commit e3cfee9b2851 · 2025-05-06T09:26:44.000-04:00
[Backport #21289]
diff --git a/addr2line.c b/addr2line.c
@@ -2173,9 +2173,8 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
         }
     }
 
-    if (offset == -1) {
+    if (offset == 0) {
         /* main executable */
-        offset = 0;
         if (dynsym_shdr && dynstr_shdr) {
             char *strtab = file + dynstr_shdr->sh_offset;
             ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);

Original file line number	Diff line number	Diff line change
`@@ -2173,9 +2173,8 @@ fill_lines(int num_traces, void **traces, int check_debuglink,`
`2173`	`2173`	`}`
`2174`	`2174`	`}`
`2175`	`2175`
`2176`		`- if (offset == -1) {`
	`2176`	`+ if (offset == 0) {`
`2177`	`2177`	`/* main executable */`
`2178`		`- offset = 0;`
`2179`	`2178`	`if (dynsym_shdr && dynstr_shdr) {`
`2180`	`2179`	`char *strtab = file + dynstr_shdr->sh_offset;`
`2181`	`2180`	`ElfW(Sym) symtab = (ElfW(Sym) )(file + dynsym_shdr->sh_offset);`