bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed a duplicate-label test.

Browse Source 
Don't call strcmp() if either argument is NULL.
This commit is contained in:
Greg King
2019-01-04 02:29:17 -05:00
parent 2959ade6e6
commit cd6e167982
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/da65/labels.c
View File

@@ -92,7 +92,9 @@ static void AddLabel (unsigned Addr, attr_t Attr, const char* Name)
** have a name (you guessed that, didn't you?). ** have a name (you guessed that, didn't you?).
*/ */
if (ExistingAttr == Attr && if (ExistingAttr == Attr &&
((Name == 0 && SymTab[Addr] == 0) || strcmp (SymTab[Addr], Name) == 0)) { ((Name == 0 && SymTab[Addr] == 0) ||
(Name != 0 && SymTab[Addr] != 0 &&
strcmp (SymTab[Addr], Name) == 0))) {
return; return;
} }
Error ("Duplicate label for address $%04X: %s/%s", Addr, SymTab[Addr], Name); Error ("Duplicate label for address $%04X: %s/%s", Addr, SymTab[Addr], Name);