[Pspp-cvs] pspp src/language/control/ChangeLog src/languag...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/12/01 06:02:35

Modified files:
        src/language/control: ChangeLog repeat.c 
        tests          : ChangeLog automake.mk 

Log message:
        Properly handle empty DO REPEAT...END REPEAT block.  Fixes bug #18407.
        Thanks to John Darrington for reporting this bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/ChangeLog?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/repeat.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.18&r2=1.19

Patches:
Index: src/language/control/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/language/control/ChangeLog      28 Oct 2006 08:31:23 -0000      1.4
+++ src/language/control/ChangeLog      1 Dec 2006 06:02:35 -0000       1.5
@@ -1,3 +1,9 @@
+Thu Nov 30 22:01:27 2006  Ben Pfaff  <address@hidden>
+
+       * repeat.c (do_repeat_read): Properly handle empty DO REPEAT...END
+       REPEAT block.  Fixes bug #18407.  Thanks to John Darrington for
+       reporting this bug.
+
 Sat Oct 28 16:18:48 WST 2006 John Darrington <address@hidden>
 
        * repeat.c: Eliminated references to extern variable getl_buf.

Index: src/language/control/repeat.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/repeat.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/language/control/repeat.c       30 Nov 2006 10:39:00 -0000      1.17
+++ src/language/control/repeat.c       1 Dec 2006 06:02:35 -0000       1.18
@@ -549,6 +549,8 @@
       if (block->loop_idx >= block->loop_cnt)
         return false;
       block->cur_line = block->first_line;
+      if (block->cur_line == NULL)
+        return false;
     }
   line = block->cur_line;
 

Index: tests/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- tests/ChangeLog     22 Nov 2006 14:28:24 -0000      1.67
+++ tests/ChangeLog     1 Dec 2006 06:02:35 -0000       1.68
@@ -1,3 +1,9 @@
+Thu Nov 30 22:01:57 2006  Ben Pfaff  <address@hidden>
+
+       * automake.mk: Add new test.
+
+       * tests/bugs/empty-do-repeat: New test, for bug #18407.
+
 Wed Nov 22 06:28:04 2006  Ben Pfaff  <address@hidden>
 
        * tests/bugs/signals.sh: Fix race condition.

Index: tests/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/automake.mk,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- tests/automake.mk   29 Nov 2006 02:15:01 -0000      1.18
+++ tests/automake.mk   1 Dec 2006 06:02:35 -0000       1.19
@@ -85,6 +85,7 @@
        tests/bugs/curtailed.sh \
        tests/bugs/data-crash.sh \
        tests/bugs/double-frequency.sh \
+       tests/bugs/empty-do-repeat.sh \
        tests/bugs/get.sh \
        tests/bugs/examine-1sample.sh \
        tests/bugs/examine-missing.sh \