[gawk-diffs] [SCM] gawk branch, master, updated. 9b304d53b807e4baaf128a6f15ec176fca4dba6f

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  9b304d53b807e4baaf128a6f15ec176fca4dba6f (commit)
      from  bcbe7799ffc4b051e52eaf8f7f19ff844d4c7d20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=9b304d53b807e4baaf128a6f15ec176fca4dba6f

commit 9b304d53b807e4baaf128a6f15ec176fca4dba6f
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Jun 20 20:39:13 2011 +0300

    Add fix for crash from grep, add test case.

diff --git a/ChangeLog b/ChangeLog
index 5489cff..af6bd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 20 20:33:26 2011  Arnold D. Robbins  <address@hidden>
+
+       * dfa.c (dfaanalyze): Allocate the right number of leaves to
+       avoid crashes. Thanks to Jim Meyering.
+
 Mon Jun 20 20:22:35 2011  Arnold D. Robbins  <address@hidden>
 
        * dfa.c (setbit_c, setbit_case_fold_c): Compare btowc result against
diff --git a/dfa.c b/dfa.c
index 0c11054..228c909 100644
--- a/dfa.c
+++ b/dfa.c
@@ -2137,7 +2137,7 @@ dfaanalyze (struct dfa *d, int searchflag)
   MALLOC(lastpos, position, d->nleaves);
   o_lastpos = lastpos, lastpos += d->nleaves;
   CALLOC(nalloc, int, d->tindex);
-  MALLOC(merged.elems, position, d->nleaves);
+  MALLOC(merged.elems, position, 2 * d->nleaves);
 
   CALLOC(d->follows, position_set, d->tindex);
 
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 919e855..9662120 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 20 20:37:19 2011  Arnold D. Robbins  <address@hidden>
+
+       * Makefile.tst: Sync with mainline version.
+
 Mon Jun 20 20:16:58 2011  Eli Zaretskii  <address@hidden>
 
        * Makefile (LIBOBJS): Remove hard-locale$O.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 09e3f0d..b932bd6 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -127,9 +127,9 @@ BASIC_TESTS = \
        aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
        closebad clsflnam compare compare2 concat1 concat2 concat3 \
        concat4 convfmt datanonl defref delargv delarpm2 delarprm delfunc \
-       dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 fldchg \
-       fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel \
-       forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
+       dfastress dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 \
+       fldchg fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc \
+       fordel forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
        funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
        gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
        hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
@@ -942,6 +942,11 @@ delfunc:
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
+dfastress:
+       @echo dfastress
+       @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
 dynlj:
        @echo dynlj
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/ChangeLog b/test/ChangeLog
index 96962f3..3d5b4de 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 20 20:35:04 2011  Arnold D. Robbins  <address@hidden>
+
+       * dfastress.awk, dfastress.ok: New files.
+       * Makefile.am (dfastress): New test.
+
 Sun Jun  5 21:45:27 2011  Arnold D. Robbins  <address@hidden>
 
        * fpat1.ok, fpat1.in: Updated to test things better.
diff --git a/test/Makefile.am b/test/Makefile.am
index e3dbce0..9e66a8f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -167,6 +167,8 @@ EXTRA_DIST = \
        devfd1.awk \
        devfd1.ok \
        devfd2.ok \
+       dfastress.awk \
+       dfastress.ok \
        double1.awk \
        double1.ok \
        double2.awk \
@@ -760,9 +762,9 @@ BASIC_TESTS = \
        aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
        closebad clsflnam compare compare2 concat1 concat2 concat3 \
        concat4 convfmt datanonl defref delargv delarpm2 delarprm delfunc \
-       dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 fldchg \
-       fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel \
-       forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
+       dfastress dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 \
+       fldchg fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc \
+       fordel forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
        funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
        gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
        hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
diff --git a/test/Makefile.in b/test/Makefile.in
index 3de264e..3399016 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -352,6 +352,8 @@ EXTRA_DIST = \
        devfd1.awk \
        devfd1.ok \
        devfd2.ok \
+       dfastress.awk \
+       dfastress.ok \
        double1.awk \
        double1.ok \
        double2.awk \
@@ -945,9 +947,9 @@ BASIC_TESTS = \
        aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
        closebad clsflnam compare compare2 concat1 concat2 concat3 \
        concat4 convfmt datanonl defref delargv delarpm2 delarprm delfunc \
-       dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 fldchg \
-       fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel \
-       forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
+       dfastress dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 \
+       fldchg fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc \
+       fordel forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
        funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
        gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
        hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
@@ -1914,6 +1916,11 @@ delfunc:
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
+dfastress:
+       @echo dfastress
+       @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
 dynlj:
        @echo dynlj
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 243d07b..9a16eb7 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -190,6 +190,11 @@ delfunc:
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
+dfastress:
+       @echo dfastress
+       @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
 dynlj:
        @echo dynlj
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/dfastress.awk b/test/dfastress.awk
new file mode 100644
index 0000000..40dd3ee
--- /dev/null
+++ b/test/dfastress.awk
@@ -0,0 +1 @@
+BEGIN { print "a" ~ /(^| )*(a|b)*(c|d)( |$)/ }
diff --git a/test/dfastress.ok b/test/dfastress.ok
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/test/dfastress.ok
@@ -0,0 +1 @@
+0
diff --git a/vms/ChangeLog b/vms/ChangeLog
index bfbf759..ba58553 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 20 20:38:35 2011  Arnold D. Robbins  <address@hidden>
+
+       * vmstest.com (dfastress): New test.
+
 Mon Jun 20 20:24:34 2011  Pat Rankin  <address@hidden>
 
        * descrip.mms: Remove compilation of hard-locale.c.
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 5a2078a..b771028 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -48,6 +48,7 @@ $             list = "msg addcomma anchgsub argarray 
arrayparm arrayref" -
 $              gosub list_of_tests
 $              list = "concat2 concat3 concat4 convfmt datanonl defref" -
                  + " delargv delarprm delarpm2 delfunc dynlj eofsplit 
exitval1" -
+                 + " dfastress" -
                  + " exitval2 fcall_exit fcall_exit2 fldchg fldchgnf" -
                  + " fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc" -
                  + " fordel forref forsimp fsbs fsspcoln fsrs fstabplus" -
@@ -940,6 +941,7 @@ $aryprm5:
 $aryprm6:
 $aryprm7:
 $delfunc:
+$dfastress:
 $nfneg:
 $numindex:
 $scalar:

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                           |    5 +++++
 dfa.c                               |    2 +-
 pc/ChangeLog                        |    4 ++++
 pc/Makefile.tst                     |   11 ++++++++---
 test/ChangeLog                      |    5 +++++
 test/Makefile.am                    |    8 +++++---
 test/Makefile.in                    |   13 ++++++++++---
 test/Maketests                      |    5 +++++
 test/dfastress.awk                  |    1 +
 test/{sortempty.ok => dfastress.ok} |    0
 vms/ChangeLog                       |    4 ++++
 vms/vmstest.com                     |    2 ++
 12 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 test/dfastress.awk
 copy test/{sortempty.ok => dfastress.ok} (100%)


hooks/post-receive
-- 
gawk