Merge pull request #219 from abrt/rhbz1191586_i386_vdso

jfilak · jfilak · commit f043ab5a7e50 · 2015-02-27T15:41:50.000+01:00
unwind: include filename for VDSOs
diff --git a/lib/core_unwind.c b/lib/core_unwind.c
@@ -294,12 +294,12 @@ resolve_frame(Dwfl *dwfl, Dwarf_Addr ip, bool minus_one)
             sr_bin2hex(frame->build_id, (const char *)build_id_bits, ret);
         }
 
-        if (dwfl_module_info(mod, NULL, &start, NULL, NULL, NULL,
-                             &filename, NULL) != NULL)
+        char *modname = dwfl_module_info(mod, NULL, &start, NULL, NULL, NULL,
+                                         &filename, NULL);
+        if (modname)
         {
             frame->build_id_offset = ip - start;
-            if (filename)
-                frame->file_name = sr_strdup(filename);
+            frame->file_name = filename ? sr_strdup(filename) : sr_strdup(modname);
         }
 
         funcname = dwfl_module_addrname(mod, (GElf_Addr)ip_adjusted);

Original file line number	Diff line number	Diff line change
`@@ -294,12 +294,12 @@ resolve_frame(Dwfl *dwfl, Dwarf_Addr ip, bool minus_one)`
`294`	`294`	`sr_bin2hex(frame->build_id, (const char *)build_id_bits, ret);`
`295`	`295`	`}`
`296`	`296`
`297`		`- if (dwfl_module_info(mod, NULL, &start, NULL, NULL, NULL,`
`298`		`- &filename, NULL) != NULL)`
	`297`	`+ char *modname = dwfl_module_info(mod, NULL, &start, NULL, NULL, NULL,`
	`298`	`+ &filename, NULL);`
	`299`	`+ if (modname)`
`299`	`300`	`{`
`300`	`301`	`frame->build_id_offset = ip - start;`
`301`		`- if (filename)`
`302`		`- frame->file_name = sr_strdup(filename);`
	`302`	`+ frame->file_name = filename ? sr_strdup(filename) : sr_strdup(modname);`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`funcname = dwfl_module_addrname(mod, (GElf_Addr)ip_adjusted);`