Merge SVN 3801

cobc/ChangeLog

@@ -1211,6 +1211,10 @@
 
 	* scanner.l (read_literal): catch and error  missing termination of literal
 
+2020-09-02  James K. Lowden  <[email protected]>
+
+	* cobc.c, error.c: prevent messages from overflowing message buffer
+
 2020-09-01  Simon Sobisch <[email protected]>
 
 	* codegen.c (codegen_init): fixed broken codegen for multi-source compiles

cobc/error.c

@@ -108,7 +108,7 @@ print_error (const char *file, int line, const char *prefix,
 		last_paragraph = current_paragraph;
 	}
 
-	/* Print the error */
+	/* Print the error TODO: use cobc_err_msg*/
 	print_error_prefix (file, line, prefix);
 	if (!cb_src_list_file) {
 		/* note: better would be one print path, but this would

tests/ChangeLog

@@ -127,6 +127,10 @@
 	  now also unsets cobc related environment variables:
 	  use $() instead of backticks in all places
 
+2020-09-02  James K. Lowden  <[email protected]>
+
+	* testsuite.src/syn_misc.at: attempted fix #336, still slightly borked
+
 2020-07-19  Edward Hart <[email protected]>
 
 	* atlocal.in, atlocal_valgrind, atlocal_win: replaced COB_HAS_CJSON with

tests/testsuite.src/syn_misc.at

@@ -7633,7 +7633,7 @@ prog.cob:42: warning: OPEN LEAVE/REREAD/DISP is obsolete in GnuCOBOL
 AT_CLEANUP
 
 
-AT_SETUP([very long literal in error message])
+AT_SETUP([very long literal in error message, max 1024])
 AT_KEYWORDS([misc literals])
 
 AT_DATA([prog.cob], [
@@ -7663,7 +7663,7 @@ AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
 ])
 
 AT_CLEANUP
-
+#' <-- fix syntax highlighting
 
 AT_SETUP([literal missing terminating character])
 AT_KEYWORDS([misc literals terminator])