X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=token.c;h=5b783a3be2e378e3b787846775e75b6757a027a9;hb=cbc8347d4ffea164ca05b03e4e3be39945be8777;hp=c8678532a271a00e4b84d20d16f1edd812146646;hpb=114298f750ded052c36763d7b224312fbb71eb25;p=rmac

diff --git a/token.c b/token.c
index c867853..5b783a3 100644
--- a/token.c
+++ b/token.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
 // TOKEN.C - Token Handling
-// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -22,7 +22,7 @@
 
 
 int lnsave;					// 1; strcpy() text of current line
-uint16_t curlineno;			// Current line number (64K max currently)
+uint32_t curlineno;			// Current line number (64K max currently)
 int totlines;				// Total # of lines
 int mjump_align = 0;		// mjump alignment flag
 char lntag;					// Line tag
@@ -604,6 +604,9 @@ DEBUG { printf("ExM: SYMBOL=\"%s\"", d); }
 							case CR_ABSCOUNT:
 								d = "^^abscount";
 								break;
+							case CR_FILESIZE:
+								d = "^^filesize";
+								break;
 							case CR_DATE:
 								d = "^^date";
 								break;
@@ -670,7 +673,6 @@ overflow:
 char * GetNextMacroLine(void)
 {
 	IMACRO * imacro = cur_inobj->inobj.imacro;
-//	LONG * strp = imacro->im_nextln;
 	LLIST * strp = imacro->im_nextln;
 
 	if (strp == NULL)						// End-of-macro
@@ -789,7 +791,7 @@ int fpop(void)
 	if (numUnmatched > 0)
 		warn("missing %d .endif(s)", numUnmatched);
 
-	tok = inobj->in_otok;	// Restore tok and otok
+	tok = inobj->in_otok;	// Restore tok and etok
 	etok = inobj->in_etok;
 
 	switch (inobj->in_type)
@@ -1041,7 +1043,13 @@ DEBUG { printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n"); }
 	// macro-type blocks, since it is expensive to unconditionally copy every
 	// line.
 	if (lnsave)
+	{
+		// Sanity check
+		if (strlen(ln) > LNSIZ)
+			return error("line too long (%d, max %d)", strlen(ln), LNSIZ);
+
 		strcpy(lnbuf, ln);
+	}
 
 	// General housekeeping
 	tok = tokeol;			// Set "tok" to EOL in case of error
@@ -1072,6 +1080,12 @@ DEBUG { printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n"); }
 	//  o  handle multiple-character tokens (constants, strings, etc.).
 	for(; *ln!=EOS;)
 	{
+		// Check to see if there's enough space in the token buffer
+		if (tk.cp >= ((uint8_t *)(&tokbuf[TOKBUFSIZE])) - 20)
+		{
+			return error("token buffer overrun");
+		}
+
 		// Skip whitespace, handle EOL
 		while (chrtab[*ln] & WHITE)
 			ln++;
@@ -1731,6 +1745,8 @@ void DumpToken(TOKEN t)
 		printf("[ENDEXPR]");
 	else if (t == CR_ABSCOUNT)
 		printf("[CR_ABSCOUNT]");
+	else if (t == CR_FILESIZE)
+		printf("[CR_FILESIZE]");
 	else if (t == CR_DEFINED)
 		printf("[CR_DEFINED]");
 	else if (t == CR_REFERENCED)
@@ -1835,6 +1851,8 @@ void DumpTokenBuffer(void)
 			printf("[ENDEXPR]");
 		else if (*t == CR_ABSCOUNT)
 			printf("[CR_ABSCOUNT]");
+		else if (*t == CR_FILESIZE)
+			printf("[CR_FILESIZE]");
 		else if (*t == CR_DEFINED)
 			printf("[CR_DEFINED]");
 		else if (*t == CR_REFERENCED)