aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2021-04-16 18:02:53 +0300
committerArnold D. Robbins <arnold@skeeve.com>2021-04-16 18:02:53 +0300
commit5e746ef5a7fbc34a62641a820156b9837b286630 (patch)
tree8aef3f3c8c63e6b17fb63b3c6e822750c6c1af53
parent7d775b9560e8ad2eb1f55a843e27f3b929e35223 (diff)
parentde59839144d666b3d8369395159c85ebb40e27fe (diff)
downloadegawk-5e746ef5a7fbc34a62641a820156b9837b286630.tar.gz
egawk-5e746ef5a7fbc34a62641a820156b9837b286630.tar.bz2
egawk-5e746ef5a7fbc34a62641a820156b9837b286630.zip
Merge branch 'gawk-5.1-stable'
-rw-r--r--ChangeLog6
-rw-r--r--main.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b742db9..57cd97bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-16 Arnold D. Robbins <arnold@skeeve.com>
+
+ * main (arg_assign): For -v '@/...' make sure that there are
+ at least three characters there. Thanks to Ed Morton
+ <mortoneccc@comcast.net> for the report.
+
2021-04-14 Arnold D. Robbins <arnold@skeeve.com>
Fix up lint warnings for "no effect" to avoid false warnings.
diff --git a/main.c b/main.c
index 5b153bc3..19c50b6d 100644
--- a/main.c
+++ b/main.c
@@ -1203,6 +1203,7 @@ arg_assign(char *arg, bool initing)
cp2 = cp + strlen(cp) - 1; // end char
if (! do_traditional
+ && strlen(cp) >= 3 // '@/' doesn't do it.
&& cp[0] == '@' && cp[1] == '/' && *cp2 == '/') {
// typed regex
size_t len = strlen(cp) - 3;