Patch #6302.

[pspp-builds.git] / src / data / casegrouper.c

diff --git a/src/data/casegrouper.c b/src/data/casegrouper.c
index 8a4f05b318faa2874dab7d1e695a9d9901ab94c6..f5974a404b0a6200729548a62a2d67afde684323 100644 (file)
--- a/src/data/casegrouper.c
+++ b/src/data/casegrouper.c
@@ -110,9 +110,18 @@ casegrouper_get_next_group (struct casegrouper *grouper,
     {
       if (grouper->reader != NULL)
         {
-          *reader = grouper->reader;
-          grouper->reader = NULL;
-          return true;
+          if (!casereader_is_empty (grouper->reader))
+            {
+              *reader = grouper->reader;
+              grouper->reader = NULL;
+              return true;
+            }
+          else
+            {
+              casereader_destroy (grouper->reader);
+              grouper->reader = NULL;
+              return false;
+            }
         }
       else
         {