diff --git a/addr2line.c b/addr2line.c
index c28bf8b459..3ab5c36f9b 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -159,9 +159,25 @@ typedef struct obj_info {
     struct dwarf_section debug_str;
     struct obj_info *next;
 } obj_info_t;
-#define obj_dwarf_section_at(obj,n) (&obj->debug_abbrev + n)
+
 #define DWARF_SECTION_COUNT 5
 
+static struct dwarf_section *
+obj_dwarf_section_at(obj_info_t *obj, int n)
+{
+    struct dwarf_section *ary[] = {
+        &obj->debug_abbrev,
+        &obj->debug_info,
+        &obj->debug_line,
+        &obj->debug_ranges,
+        &obj->debug_str
+    };
+    if (n < 0 || DWARF_SECTION_COUNT <= n) {
+        abort();
+    }
+    return ary[n];
+}
+
 struct debug_section_definition {
     const char *name;
     struct dwarf_section *dwarf;