Fix CentOS 7 core dumps.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 70859ca2..9912037d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-08-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h (NODE): Move valref completely out of the union. Fixes
+	core dumps on old GCC on CentOS 7.
+
 2020-08-13         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Fix TIDYMEM / use of mtrace.
diff --git a/awk.h b/awk.h
index 3b688b0c..c2218cd8 100644
--- a/awk.h
+++ b/awk.h
@@ -382,7 +382,6 @@ typedef struct exp_node {
 #endif
 			char *sp;
 			size_t slen;
-			long sref;
 			int idx;
 			wchar_t *wsp;
 			size_t wslen;
@@ -464,6 +463,7 @@ typedef struct exp_node {
 		NUMCONSTSTR	= 0x20000,	/* have string value for numeric constant */
 		REGEX           = 0x40000,	/* this is a typed regex */
 	} flags;
+	long valref;
 } NODE;
 
 #define vname sub.nodep.name
@@ -500,7 +500,6 @@ typedef struct exp_node {
  */
 #define stptr	sub.val.sp
 #define stlen	sub.val.slen
-#define valref	sub.val.sref
 #define stfmt	sub.val.idx
 #define strndmode sub.val.rndmode
 #define wstptr	sub.val.wsp