summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2022-04-06 20:07:43 +0300
committerArnold D. Robbins <arnold@skeeve.com>2022-04-06 20:07:43 +0300
commit62ec80d7efa0b559738f0ccab6b0e9b0a72344b0 (patch)
tree7ace602b6d96ec61c255785b5760fd516f9028a9 /support
parent4bbfe95a4f14520de2d40d8bf055cec17ce2396b (diff)
parent0d4519f6aa19e7529f1b203cf1584a872b4011aa (diff)
downloadgawk-62ec80d7efa0b559738f0ccab6b0e9b0a72344b0.tar.gz
Merge branch 'gawk-5.1-stable'
Diffstat (limited to 'support')
-rw-r--r--support/ChangeLog6
-rw-r--r--support/dfa.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index 507d4561..69c91e5b 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,9 @@
+2022-04-06 Arnold D. Robbins <arnold@skeeve.com>
+
+ * dfa.c (parse_bracket_exp): Use && instead of & in logical test.
+ Thanks to David Binderman <dcb314@hotmail.com> for the report,
+ courtesy of clang 14.
+
2022-03-25 Arnold D. Robbins <arnold@skeeve.com>
* cdefs.h, regex_internal.c, regexec.c: Sync with GNULIB.
diff --git a/support/dfa.c b/support/dfa.c
index a27d096f..45adb80f 100644
--- a/support/dfa.c
+++ b/support/dfa.c
@@ -1090,7 +1090,7 @@ parse_bracket_exp (struct dfa *dfa)
if (wc != wc2 || wc == WEOF)
{
if (dfa->localeinfo.simple
- || (isasciidigit (c) & isasciidigit (c2)))
+ || (isasciidigit (c) && isasciidigit (c2)))
{
for (int ci = c; ci <= c2; ci++)
if (dfa->syntax.case_fold && isalpha (ci))