Blob Blame History Raw
From 2fc24847acc0e7d8718059f33b1d431d557050ef Mon Sep 17 00:00:00 2001
From: Greg King <gregdk@users.sf.net>
Date: Wed, 11 Mar 2020 17:28:42 -0400
Subject: [PATCH 156/170] Fixed an error message printer.

The disassembler can be built and won't crash if it sees duplicate labels, and one of them is an unnamed label.
---
 src/da65/labels.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/da65/labels.c b/src/da65/labels.c
index 97e195eb..542205c1 100644
--- a/src/da65/labels.c
+++ b/src/da65/labels.c
@@ -97,7 +97,9 @@ static void AddLabel (unsigned Addr, attr_t Attr, const char* Name)
              strcmp (SymTab[Addr], Name) == 0))) {
             return;
         }
-        Error ("Duplicate label for address $%04X: %s/%s", Addr, SymTab[Addr], Name);
+        Error ("Duplicate label for address $%04X (%s): '%s'", Addr,
+               SymTab[Addr] == 0 ? "<unnamed label>" : SymTab[Addr],
+               Name == 0 ? "<unnamed label>" : Name);
     }
 
     /* Create a new label (xstrdup will return NULL if input NULL) */
-- 
2.26.0