shithub: rgbds

Info  •  Files  •  Log  •  Branches

Work around a crash when '@' is interpreted as a macro name.

--- a/src/asm/asmy.y

+++ b/src/asm/asmy.y

@@ -540,7 +540,7 @@

 		yy_set_state(LEX_STATE_NORMAL);

 		if (!fstk_RunMacro($1)) {

-			yyerror("Macro '%s' not defined", $1);

+			fatalerror("Macro '%s' not defined", $1);

 		}

 	};

--- a/src/asm/fstack.c

+++ b/src/asm/fstack.c

@@ -255,6 +255,8 @@

 		sym_UseNewMacroArgs();

 		nCurrentStatus = STAT_isMacro;

 		strcpy(tzCurrentFileName, s);

+		if (sym->pMacro == NULL)

+			return 0;

 		pCurrentMacro = sym;

 		CurrentFlexHandle =

 		    yy_scan_bytes(pCurrentMacro->pMacro,