libbacktrace: don't special case file 0

It's no longer necessary as file 0 is now set up in all cases. * dwarf.c (read_line_program): Don't special case file 0. (read_function_entry): Likewise. Fixes #69

libbacktrace: don't special case file 0
4f57c999 · Ian Lance Taylor · 59473f79 · 4f57c999
Commit 4f57c999 authored Mar 02, 2021 by Ian Lance Taylor
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 12 deletions

dwarf.c dwarf.c +1 -12

No files found.
--- a/dwarf.c
+++ b/dwarf.c
@@ -3190,10 +3190,6 @@ read_line_program (struct backtrace_state *state, struct dwarf_data *ddata,
 		uint64_t fileno;
 		fileno = read_uleb128 (line_buf);
-		if (fileno == 0)
-		  filename = "";
-		else
-		  {
 		if (fileno >= hdr->filenames_count)
 		  {
 		    dwarf_buf_error (line_buf,
@@ -3204,7 +3200,6 @@ read_line_program (struct backtrace_state *state, struct dwarf_data *ddata,
 		  }
 		filename = hdr->filenames[fileno];
 	      }
-	      }
 	      break;
 	    case DW_LNS_set_column:
 	      read_uleb128 (line_buf);
@@ -3631,10 +3626,6 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
 		case DW_AT_call_file:
 		  if (val.encoding == ATTR_VAL_UINT)
 		    {
-		      if (val.u.uint == 0)
-			function->caller_filename = "";
-		      else
-			{
 		      if (val.u.uint >= lhdr->filenames_count)
 			{
 			  dwarf_buf_error (unit_buf,
@@ -3643,9 +3634,7 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
 					   0);
 			  return 0;
 			}
-			  function->caller_filename =
+		      function->caller_filename = lhdr->filenames[val.u.uint];
-			    lhdr->filenames[val.u.uint];
-			}
 		    }
 		  break;