X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;fp=token.c;h=1e5428200bf0ce952b748445e15349f42bd09765;hp=55dbc290980722d06ed144755e43bb85587965a5;hb=c4fcee52c8615c20a176862eeee74739f6dc3849;hpb=ace0b549a94110b69ec61442f825fb421b79799a

diff --git a/token.c b/token.c
index 55dbc29..1e54282 100644
--- a/token.c
+++ b/token.c
@@ -792,7 +792,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)
@@ -1044,7 +1044,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
@@ -1075,6 +1081,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])))
+		{
+			return error("token buffer overrun");
+		}
+
 		// Skip whitespace, handle EOL
 		while (chrtab[*ln] & WHITE)
 			ln++;