Patch #6302.

* crosstabs.q (precalc): Initialize data structures even if the
first case cannot be read.

* frequencies.q (precalc): Ditto.

diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 21c28c7911c7bed1a35d90be39e0cee4bd9b0df4..fda8c9356b103eba9325904b5baebb039c9421e5 100644 (file)
--- a/src/language/stats/ChangeLog
+++ b/src/language/stats/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-07  Ben Pfaff  <blp@gnu.org>
+
+       Patch #6302.
+
+       * crosstabs.q (precalc): Initialize data structures even if the
+       first case cannot be read.  
+
+       * frequencies.q (precalc): Ditto.
+
 2007-11-03  Ben Pfaff  <blp@gnu.org>
 
        Allow output files to overwrite input files (bug #21280).

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index 5277e54528820be8b1efb783c1e31d38a2b14344..3bffa2a32f5839f712548f8f07e4f765fe719c6c 100644 (file)
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -520,10 +520,11 @@ precalc (struct casereader *input, const struct dataset *ds)
 {
   struct ccase c;
 
-  if (!casereader_peek (input, 0, &c))
-    return;
-  output_split_file_values (ds, &c);
-  case_destroy (&c);
+  if (casereader_peek (input, 0, &c))
+    {
+      output_split_file_values (ds, &c);
+      case_destroy (&c);
+    }
 
   if (mode == GENERAL)
     {

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index fdb19b0391f9c23dec4e036217e40b9bfa6af466..ef4769b60e17339f9133f394e93ea3415d5cf20f 100644 (file)
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -538,10 +538,11 @@ precalc (struct casereader *input, struct dataset *ds)
   struct ccase c;
   size_t i;
 
-  if (!casereader_peek (input, 0, &c))
-    return;
-  output_split_file_values (ds, &c);
-  case_destroy (&c);
+  if (casereader_peek (input, 0, &c))
+    {
+      output_split_file_values (ds, &c);
+      case_destroy (&c);
+    }
 
   pool_destroy (data_pool);
   data_pool = pool_create ();