longstring segfault fix

msaarna · msaarna · commit 77c3169e09b9 · 2019-12-11T14:05:11.000-05:00
diff --git a/src/asm.h b/src/asm.h
@@ -63,7 +63,7 @@ enum FORMAT
     FORMAT_MAX
 };
 
-
+#define MAXLINE 1024
 #define MAX_SYM_LEN 1024
 
     enum ASM_ERROR_EQUATES
diff --git a/src/main.c b/src/main.c
@@ -34,7 +34,6 @@
 
 static const char dasm_id[] = DASM_ID;
 
-#define MAXLINE 1024
 #define ISEGNAME    "INITIAL CODE SEGMENT"
 
 /*
diff --git a/src/ops.c b/src/ops.c
@@ -29,7 +29,7 @@
 
 #include "asm.h"
 
-unsigned char Gen[256];
+unsigned char Gen[MAXLINE];
 unsigned char OrgFill = DEFORGFILL;
 int	 Glen;
 
diff --git a/test/longstring.asm b/test/longstring.asm
@@ -0,0 +1,13 @@
+; Test long strings
+;
+; This came about due to strings longer than 256 bytes causing
+; segfaults, due to overflow of a buffer in the opcode handling.
+;
+; --Mike Saarna
+
+	.processor	6502
+	.org		0
+
+	.byte "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+
+	.end
diff --git a/test/longstring.bin.ref b/test/longstring.bin.ref
diff --git a/test/longstring.hex.ref b/test/longstring.hex.ref
@@ -0,0 +1,19 @@
+:1000000031323334353637383930313233343536AE
+:100010003738393031323334353637383930313298
+:100020003334353637383930313233343536373882
+:100030003930313233343536373839303132333480
+:100040003536373839303132333435363738393060
+:10005000313233343536373839303132333435365E
+:100060003738393031323334353637383930313248
+:100070003334353637383930313233343536373832
+:100080003930313233343536373839303132333430
+:100090003536373839303132333435363738393010
+:1000A000313233343536373839303132333435360E
+:1000B00037383930313233343536373839303132F8
+:1000C00033343536373839303132333435363738E2
+:1000D00039303132333435363738393031323334E0
+:1000E00035363738393031323334353637383930C0
+:1000F00031323334353637383930313233343536BE
+:1001000037383930313233343536373839303132A7
+:0801100033343536373839303D
+:00000001FF
