From: Ben Pfaff <blp@gnu.org>
Date: Sat, 14 Oct 2006 23:57:54 +0000 (+0000)
Subject: 	* casefile.c (casereader_read_xfer): Always initialize the case,
X-Git-Tag: v0.6.0~730
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cd5a0687db8ca3ed8b58033e71f11818e8c3498;p=pspp-builds.git

	* casefile.c (casereader_read_xfer): Always initialize the case,
	even on an error condition.
---

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 856a177d..fb3632a9 100644
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 14 16:56:44 2006  Ben Pfaff  <blp@gnu.org>
+
+	* casefile.c (casereader_read_xfer): Always initialize the case,
+	even on an error condition.
+
 Wed Sep 27 09:37:49 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
 	* procedure.c (case_limit_trns_proc): Fixed buglet which rendered the 
diff --git a/src/data/casefile.c b/src/data/casefile.c
index f0e700d5..e6c6fa67 100644
--- a/src/data/casefile.c
+++ b/src/data/casefile.c
@@ -150,6 +150,7 @@ casereader_read_xfer (struct casereader *ffr, struct ccase *c)
 
   struct ccase *read_case = NULL ;
 
+  case_nullify (c);
   if ( casefile_error (cf) )
     return false;
 
@@ -157,10 +158,7 @@ casereader_read_xfer (struct casereader *ffr, struct ccase *c)
   if ( ! read_case ) return false;
 
   if ( ffr->destructive && casefile_in_core (cf) )
-    {
-      case_nullify (c);
     case_move (c, read_case);
-    }
   else
     case_clone (c, read_case);