diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | awk.h | 6 | ||||
| -rw-r--r-- | awkgram.c | 2 | ||||
| -rw-r--r-- | awkgram.y | 2 |
4 files changed, 16 insertions, 6 deletions
@@ -4,6 +4,18 @@ @include works in multibyte locales. Thanks to Hermann Peifer for the bug report. +2017-04-26 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * awkgram.y (make_regnode): Fix bug -- we should not set valref to 1 + when creating a node of type Node_regex, since valref is appropriate + only for Node_val nodes. This fixes a bug introduced in commit + 687e6594. Also, add an assert to make it clear that this function + supports only Node_regex and Node_dynregex. + * awk.h (NODE): Restore sref to the `val' subportion, since it is not + really needed for Node_regex, now that the bug in make_regnode has + been fixed. + (valref): Restore macro definition. + 2017-04-24 Arnold D. Robbins <arnold@skeeve.com> * awk.h (NODE): Additional cleanups. Removed `aq' and `param_list' @@ -374,6 +374,7 @@ typedef struct exp_node { #endif char *sp; size_t slen; + long sref; int idx; wchar_t *wsp; size_t wslen; @@ -383,10 +384,6 @@ typedef struct exp_node { NODETYPE type; unsigned int flags; - // We access valref for both Node_val and Node_regex values, - // so it needs to be outside the union. - long valref; - /* type = Node_val */ /* * STRING and NUMBER are mutually exclusive, except for the special @@ -494,6 +491,7 @@ 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 wstptr sub.val.wsp #define wstlen sub.val.wslen @@ -7429,6 +7429,7 @@ make_regnode(int type, NODE *exp) { NODE *n; + assert(type == Node_regex || type == Node_dynregex); getnode(n); memset(n, 0, sizeof(NODE)); n->type = type; @@ -7448,7 +7449,6 @@ make_regnode(int type, NODE *exp) } n->re_exp = exp; n->re_flags = CONSTANT; - n->valref = 1; } return n; } @@ -5009,6 +5009,7 @@ make_regnode(int type, NODE *exp) { NODE *n; + assert(type == Node_regex || type == Node_dynregex); getnode(n); memset(n, 0, sizeof(NODE)); n->type = type; @@ -5028,7 +5029,6 @@ make_regnode(int type, NODE *exp) } n->re_exp = exp; n->re_flags = CONSTANT; - n->valref = 1; } return n; } |