X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsfm-read.c;h=109c9a1a5a2ca171fa6dfb7a29db1c8581b000c6;hb=b9799cdd10b30ea96d9178b7a0d48504d052228c;hp=e854e1bad651a85a50bc0bfab437920bdfe1ea0c;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp-builds.git

diff --git a/src/sfm-read.c b/src/sfm-read.c
index e854e1ba..109c9a1a 100644
--- a/src/sfm-read.c
+++ b/src/sfm-read.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "sfm-read.h"
@@ -33,7 +33,7 @@
 #include "file-handle.h"
 #include "filename.h"
 #include "format.h"
-#include "getline.h"
+#include "getl.h"
 #include "hash.h"
 #include "magic.h"
 #include "misc.h"
@@ -41,6 +41,9 @@
 #include "str.h"
 #include "var.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "debug-print.h"
 
 /* System file reader. */
@@ -59,7 +62,6 @@ struct sfm_reader
 
     /* Variables. */
     struct sfm_var *vars;       /* Variables. */
-    size_t var_cnt;             /* Number of variables. */
 
     /* File's special constants. */
     flt64 sysmis;
@@ -87,18 +89,18 @@ struct sfm_var
 
 /* Swap bytes *A and *B. */
 static inline void
-bswap (unsigned char *a, unsigned char *b) 
+bswap (char *a, char *b) 
 {
-  unsigned char t = *a;
+  char t = *a;
   *a = *b;
   *b = t;
 }
 
-/* bswap_int32(): Reverse the byte order of 32-bit integer *X. */
+/* Reverse the byte order of 32-bit integer *X. */
 static inline void
 bswap_int32 (int32 *x_)
 {
-  unsigned char *x = (unsigned char *) x_;
+  char *x = (char *) x_;
   bswap (x + 0, x + 3);
   bswap (x + 1, x + 2);
 }
@@ -107,7 +109,7 @@ bswap_int32 (int32 *x_)
 static inline void
 bswap_flt64 (flt64 *x_)
 {
-  unsigned char *x = (unsigned char *) x_;
+  char *x = (char *) x_;
   bswap (x + 0, x + 7);
   bswap (x + 1, x + 6);
   bswap (x + 2, x + 5);
@@ -157,6 +159,8 @@ sfm_close_reader (struct sfm_reader *r)
 
 /* Dictionary reader. */
 
+static void buf_unread(struct sfm_reader *r, size_t byte_cnt);
+
 static void *buf_read (struct sfm_reader *, void *buf, size_t byte_cnt,
                        size_t min_alloc);
 
@@ -219,7 +223,6 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
   r->weight_idx = -1;
 
   r->vars = NULL;
-  r->var_cnt = 0;
 
   r->sysmis = -FLT64_MAX;
   r->highest = FLT64_MAX;
@@ -242,10 +245,19 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
   if (!read_header (r, *dict, info) || !read_variables (r, *dict, &var_by_idx))
     goto error;
 
+
   /* Handle weighting. */
   if (r->weight_idx != -1)
     {
-      struct variable *weight_var = var_by_idx[r->weight_idx];
+      struct variable *weight_var;
+
+      if (r->weight_idx < 0 || r->weight_idx >= r->value_cnt)
+	lose ((ME, _("%s: Index of weighting variable (%d) is not between 0 "
+		     "and number of elements per case (%d)."),
+	       handle_get_filename (r->fh), r->weight_idx, r->value_cnt));
+
+
+      weight_var = var_by_idx[r->weight_idx];
 
       if (weight_var == NULL)
 	lose ((ME,
@@ -296,6 +308,7 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
 		int32 count P;
 	      }
 	    data;
+            unsigned long bytes;
 
 	    int skip = 0;
 
@@ -306,6 +319,10 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
 		bswap_int32 (&data.size);
 		bswap_int32 (&data.count);
 	      }
+            bytes = data.size * data.count;
+            if (bytes < data.size || bytes < data.count)
+              lose ((ME, "%s: Record type %d subtype %d too large.",
+                     handle_get_filename (r->fh), rec_type, data.subtype));
 
 	    switch (data.subtype)
 	      {
@@ -328,7 +345,7 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
 		{
 		  const int  n_vars = data.count / 3 ;
 		  int i;
-		  if ( data.count % 3 ) 
+		  if ( data.count % 3 || n_vars > dict_get_var_cnt(*dict) ) 
 		    {
 		      msg (MW, _("%s: Invalid subrecord length. "
 				 "Record: 7; Subrecord: 11"), 
@@ -336,7 +353,7 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
 		      skip = 1;
 		    }
 
-		  for ( i = 0 ; i < n_vars ; ++i ) 
+		  for ( i = 0 ; i < min(n_vars, dict_get_var_cnt(*dict)) ; ++i ) 
 		    {
 		      struct
 		      {
@@ -361,25 +378,79 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
 
 	      case 13: /* SPSS 12.0 Long variable name map */
 		{
-
-		  char *s;
-		  char *buf = xmalloc(data.size * data.count + 1);
-		  char *tbuf ;
-		  assertive_buf_read (r, buf, data.size * data.count, 0);
-		  buf[data.size * data.count]='\0';
-
-		  s = strtok_r(buf, "\t", &tbuf);
-		  while ( s ) 
+		  char *buf, *short_name, *save_ptr;
+                  int idx;
+
+                  /* Read data. */
+                  buf = xmalloc (bytes + 1);
+		  if (!buf_read (r, buf, bytes, 0)) 
+                    {
+                      free (buf);
+                      goto error;
+                    }
+		  buf[bytes] = '\0';
+
+                  /* Parse data. */
+		  for (short_name = strtok_r (buf, "=", &save_ptr), idx = 0;
+                       short_name != NULL;
+                       short_name = strtok_r (NULL, "=", &save_ptr), idx++)
 		    {
-		      char *shortname, *longname;
-		      shortname = strsep(&s,"=");
-		      longname = strsep(&s,"=");
-		      
-		      dict_add_longvar_entry(*dict, shortname, longname);
-
-		      s = strtok_r(0,"\t", &tbuf);
+                      char *long_name = strtok_r (NULL, "\t", &save_ptr);
+                      struct variable *v;
+
+                      /* Validate long name. */
+                      if (long_name == NULL)
+                        {
+                          msg (MW, _("%s: Trailing garbage in long variable "
+                                     "name map."),
+                               handle_get_filename (r->fh));
+                          break;
+                        }
+                      if (!var_is_valid_name (long_name, false))
+                        {
+                          msg (MW, _("%s: Long variable mapping to invalid "
+                                     "variable name `%s'."),
+                               handle_get_filename (r->fh), long_name);
+                          break;
+                        }
+                      
+                      /* Find variable using short name. */
+                      v = dict_lookup_var (*dict, short_name);
+                      if (v == NULL)
+                        {
+                          msg (MW, _("%s: Long variable mapping for "
+                                     "nonexistent variable %s."),
+                               handle_get_filename (r->fh), short_name);
+                          break;
+                        }
+
+                      /* Identify any duplicates. */
+		      if ( compare_var_names(short_name, long_name, 0) &&
+			  NULL != dict_lookup_var (*dict, long_name))
+                        {
+			  lose ((ME, _("%s: Duplicate long variable name `%s' "
+				       "within system file."),
+				 handle_get_filename (r->fh), long_name));
+                          break;
+                        }
+
+                      /* Set long name.
+                         Renaming a variable may clear the short
+                         name, but we want to retain it, so
+                         re-set it explicitly. */
+                      dict_rename_var (*dict, v, long_name);
+                      var_set_short_name (v, short_name);
+
+                      /* For compatability, make sure dictionary
+                         is in long variable name map order.  In
+                         the common case, this has no effect,
+                         because the dictionary and the long
+                         variable name map are already in the
+                         same order. */
+                      dict_reorder_var (*dict, v, idx);
 		    }
-		  
+
+		  /* Free data. */
 		  free (buf);
 		}
 		break;
@@ -410,8 +481,8 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
 	  }
 
 	default:
-	  lose ((ME, _("%s: Unrecognized record type %d."),
-                 handle_get_filename (r->fh), rec_type));
+	  corrupt_msg(MW, _("%s: Unrecognized record type %d."),
+                 handle_get_filename (r->fh), rec_type);
 	}
     }
 
@@ -594,22 +665,18 @@ read_header (struct sfm_reader *r,
       bswap_flt64 (&hdr.bias);
     }
 
+
   /* Copy basic info and verify correctness. */
   r->value_cnt = hdr.case_size;
-  if (r->value_cnt <= 0
-      || r->value_cnt > (INT_MAX / (int) sizeof (union value) / 2))
-    lose ((ME, _("%s: Number of elements per case (%d) is not between 1 "
-                 "and %d."),
-           handle_get_filename (r->fh), r->value_cnt,
-           INT_MAX / sizeof (union value) / 2));
+
+  /* If value count is rediculous, then force it to -1 (a sentinel value) */
+  if ( r->value_cnt < 0 || 
+       r->value_cnt > (INT_MAX / (int) sizeof (union value) / 2))
+    r->value_cnt = -1;
 
   r->compressed = hdr.compress;
 
   r->weight_idx = hdr.weight_idx - 1;
-  if (hdr.weight_idx < 0 || hdr.weight_idx > r->value_cnt)
-    lose ((ME, _("%s: Index of weighting variable (%d) is not between 0 "
-                 "and number of elements per case (%d)."),
-	   handle_get_filename (r->fh), hdr.weight_idx, r->value_cnt));
 
   r->case_cnt = hdr.case_cnt;
   if (r->case_cnt < -1 || r->case_cnt > INT_MAX / 2)
@@ -685,22 +752,31 @@ read_variables (struct sfm_reader *r,
   int long_string_count = 0;	/* # of long string continuation
 				   records still expected. */
   int next_value = 0;		/* Index to next `value' structure. */
-  size_t var_cap = 0;
 
   assert(r);
 
-  /* Allocate variables. */
-  *var_by_idx = xmalloc (sizeof **var_by_idx * r->value_cnt);
+  *var_by_idx = 0;
+
+  /* Pre-allocate variables. */
+  if (r->value_cnt != -1) 
+    {
+      *var_by_idx = xnmalloc (r->value_cnt, sizeof **var_by_idx);
+      r->vars = xnmalloc (r->value_cnt, sizeof *r->vars);
+    }
+
 
   /* Read in the entry for each variable and use the info to
      initialize the dictionary. */
-  for (i = 0; i < r->value_cnt; i++)
+  for (i = 0; ; ++i)
     {
       struct variable *vv;
-      char name[9];
+      char name[SHORT_NAME_LEN + 1];
       int nv;
       int j;
 
+      if ( r->value_cnt != -1  && i >= r->value_cnt ) 
+	break;
+
       assertive_buf_read (r, &sv, sizeof sv, 0);
 
       if (r->reverse_endian)
@@ -713,10 +789,19 @@ read_variables (struct sfm_reader *r,
 	  bswap_int32 (&sv.write);
 	}
 
+      /* We've come to the end of the variable entries */
       if (sv.rec_type != 2)
-	lose ((ME, _("%s: position %d: Bad record type (%d); "
-                     "the expected value was 2."),
-               handle_get_filename (r->fh), i, sv.rec_type));
+	{
+	  buf_unread(r, sizeof sv);
+	  r->value_cnt = i;
+	  break;
+	}
+
+      if ( -1 == r->value_cnt ) 
+	{
+	  *var_by_idx = xnrealloc (*var_by_idx, i + 1, sizeof **var_by_idx);
+	  r->vars = xnrealloc (r->vars, i + 1, sizeof *r->vars);
+	}
 
       /* If there was a long string previously, make sure that the
 	 continuations are present; otherwise make sure there aren't
@@ -728,6 +813,8 @@ read_variables (struct sfm_reader *r,
 			 "proper number of continuation records."),
                    handle_get_filename (r->fh), i));
 
+
+	  r->vars[i].width = -1;
 	  (*var_by_idx)[i] = NULL;
 	  long_string_count--;
 	  continue;
@@ -790,12 +877,19 @@ read_variables (struct sfm_reader *r,
 	}
       name[j] = 0;
 
+      if ( ! var_is_valid_name(name, false) ) 
+        lose ((ME, _("%s: Invalid variable name `%s' within system file."),
+               handle_get_filename (r->fh), name));
+
       /* Create variable. */
-      vv = (*var_by_idx)[i] = dict_create_var_from_short (dict, name, sv.type);
+
+      vv = (*var_by_idx)[i] = dict_create_var (dict, name, sv.type);
       if (vv == NULL) 
         lose ((ME, _("%s: Duplicate variable name `%s' within system file."),
                handle_get_filename (r->fh), name));
 
+      var_set_short_name (vv, vv->name);
+
       /* Case reading data. */
       nv = sv.type == 0 ? 1 : DIV_RND_UP (sv.type, sizeof (flt64));
       long_string_count = nv - 1;
@@ -832,77 +926,53 @@ read_variables (struct sfm_reader *r,
       if (sv.n_missing_values != 0)
 	{
 	  flt64 mv[3];
+          int mv_cnt = abs (sv.n_missing_values);
 
 	  if (vv->width > MAX_SHORT_STRING)
 	    lose ((ME, _("%s: Long string variable %s may not have missing "
                          "values."),
                    handle_get_filename (r->fh), vv->name));
 
-	  assertive_buf_read (r, mv, sizeof *mv * abs (sv.n_missing_values), 0);
+	  assertive_buf_read (r, mv, sizeof *mv * mv_cnt, 0);
 
 	  if (r->reverse_endian && vv->type == NUMERIC)
-	    for (j = 0; j < abs (sv.n_missing_values); j++)
+	    for (j = 0; j < mv_cnt; j++)
 	      bswap_flt64 (&mv[j]);
 
 	  if (sv.n_missing_values > 0)
 	    {
-	      vv->miss_type = sv.n_missing_values;
-	      if (vv->type == NUMERIC)
-		for (j = 0; j < sv.n_missing_values; j++)
-		  vv->missing[j].f = mv[j];
-	      else
-		for (j = 0; j < sv.n_missing_values; j++)
-		  memcpy (vv->missing[j].s, &mv[j], vv->width);
+              for (j = 0; j < sv.n_missing_values; j++)
+                if (vv->type == NUMERIC)
+                  mv_add_num (&vv->miss, mv[j]);
+                else
+                  mv_add_str (&vv->miss, (char *) &mv[j]);
 	    }
 	  else
 	    {
-	      int x = 0;
-
 	      if (vv->type == ALPHA)
 		lose ((ME, _("%s: String variable %s may not have missing "
                              "values specified as a range."),
                        handle_get_filename (r->fh), vv->name));
 
 	      if (mv[0] == r->lowest)
-		{
-		  vv->miss_type = MISSING_LOW;
-		  vv->missing[x++].f = mv[1];
-		}
+                mv_add_num_range (&vv->miss, LOWEST, mv[1]);
 	      else if (mv[1] == r->highest)
-		{
-		  vv->miss_type = MISSING_HIGH;
-		  vv->missing[x++].f = mv[0];
-		}
+                mv_add_num_range (&vv->miss, mv[0], HIGHEST);
 	      else
-		{
-		  vv->miss_type = MISSING_RANGE;
-		  vv->missing[x++].f = mv[0];
-		  vv->missing[x++].f = mv[1];
-		}
+                mv_add_num_range (&vv->miss, mv[0], mv[1]);
 
 	      if (sv.n_missing_values == -3)
-		{
-		  vv->miss_type += 3;
-		  vv->missing[x++].f = mv[2];
-		}
+                mv_add_num (&vv->miss, mv[2]);
 	    }
 	}
-      else
-	vv->miss_type = MISSING_NONE;
 
       if (!parse_format_spec (r, sv.print, &vv->print, vv)
 	  || !parse_format_spec (r, sv.write, &vv->write, vv))
 	goto error;
 
-      /* Add variable to list. */
-      if (var_cap >= r->var_cnt) 
-        {
-          var_cap = 2 + r->var_cnt * 2;
-          r->vars = xrealloc (r->vars, var_cap * sizeof *r->vars);
-        }
-      r->vars[r->var_cnt].width = vv->width;
-      r->vars[r->var_cnt].fv = vv->fv;
-      r->var_cnt++;
+      r->vars[i].width = vv->width;
+      r->vars[i].fv = vv->fv;
+
     }
 
   /* Some consistency checks. */
@@ -910,10 +980,12 @@ read_variables (struct sfm_reader *r,
     lose ((ME, _("%s: Long string continuation records omitted at end of "
                  "dictionary."),
            handle_get_filename (r->fh)));
+
   if (next_value != r->value_cnt)
-    lose ((ME, _("%s: System file header indicates %d variable positions but "
+    corrupt_msg(MW, _("%s: System file header indicates %d variable positions but "
                  "%d were read from file."),
-           handle_get_filename (r->fh), r->value_cnt, next_value));
+           handle_get_filename (r->fh), r->value_cnt, next_value);
+
 
   return 1;
 
@@ -924,27 +996,32 @@ error:
 /* Translates the format spec from sysfile format to internal
    format. */
 static int
-parse_format_spec (struct sfm_reader *r, int32 s, struct fmt_spec *v, struct variable *vv)
+parse_format_spec (struct sfm_reader *r, int32 s,
+                   struct fmt_spec *f, struct variable *v)
 {
-  v->type = translate_fmt ((s >> 16) & 0xff);
-  if (v->type == -1)
+  f->type = translate_fmt ((s >> 16) & 0xff);
+  if (f->type == -1)
     lose ((ME, _("%s: Bad format specifier byte (%d)."),
 	   handle_get_filename (r->fh), (s >> 16) & 0xff));
-  v->w = (s >> 8) & 0xff;
-  v->d = s & 0xff;
-
-  /* FIXME?  Should verify the resulting specifier more thoroughly. */
+  f->w = (s >> 8) & 0xff;
+  f->d = s & 0xff;
 
-  if (v->type == -1)
-    lose ((ME, _("%s: Bad format specifier byte (%d)."),
-	   handle_get_filename (r->fh), (s >> 16) & 0xff));
-  if ((vv->type == ALPHA) ^ ((formats[v->type].cat & FCAT_STRING) != 0))
+  if ((v->type == ALPHA) ^ ((formats[f->type].cat & FCAT_STRING) != 0))
     lose ((ME, _("%s: %s variable %s has %s format specifier %s."),
 	   handle_get_filename (r->fh),
-           vv->type == ALPHA ? _("String") : _("Numeric"),
-	   vv->name,
-	   formats[v->type].cat & FCAT_STRING ? _("string") : _("numeric"),
-	   formats[v->type].name));
+           v->type == ALPHA ? _("String") : _("Numeric"),
+	   v->name,
+	   formats[f->type].cat & FCAT_STRING ? _("string") : _("numeric"),
+	   formats[f->type].name));
+
+  if (!check_output_specifier (f, false)
+      || !check_specifier_width (f, v->width, false)) 
+    {
+      msg (ME, _("%s variable %s has invalid format specifier %s."),
+           v->type == NUMERIC ? _("Numeric") : _("String"),
+           v->name, fmt_to_string (f));
+      *f = v->type == NUMERIC ? f8_2 : make_output_format (FMT_A, v->width, 0);
+    }
   return 1;
 
 error:
@@ -959,7 +1036,7 @@ read_value_labels (struct sfm_reader *r,
 {
   struct label 
     {
-      unsigned char raw_value[8]; /* Value as uninterpreted bytes. */
+      char raw_value[8];        /* Value as uninterpreted bytes. */
       union value value;        /* Value. */
       char *label;              /* Null-terminated label string. */
     };
@@ -981,8 +1058,15 @@ read_value_labels (struct sfm_reader *r,
   if (r->reverse_endian)
     bswap_int32 (&n_labels);
 
+  if ( n_labels >= ((int32) ~0) / sizeof *labels)
+    {    
+      corrupt_msg(MW, _("%s: Invalid number of labels: %d.  Ignoring labels."),
+		  handle_get_filename (r->fh), n_labels);
+      n_labels = 0;
+    }
+
   /* Allocate memory. */
-  labels = xmalloc (n_labels * sizeof *labels);
+  labels = xcalloc (n_labels, sizeof *labels);
   for (i = 0; i < n_labels; i++)
     labels[i].label = NULL;
 
@@ -1034,7 +1118,7 @@ read_value_labels (struct sfm_reader *r,
 	   handle_get_filename (r->fh), n_vars, dict_get_var_cnt (dict)));
 
   /* Read the list of variables. */
-  var = xmalloc (n_vars * sizeof *var);
+  var = xnmalloc (n_vars, sizeof *var);
   for (i = 0; i < n_vars; i++)
     {
       int32 var_idx;
@@ -1082,8 +1166,8 @@ read_value_labels (struct sfm_reader *r,
       
       if (var[0]->type == ALPHA)
         {
-          const int copy_len = min (sizeof (label->raw_value),
-                                    sizeof (label->label));
+          const int copy_len = min (sizeof label->raw_value,
+                                    sizeof label->label);
           memcpy (label->value.s, label->raw_value, copy_len);
         } else {
           flt64 f;
@@ -1165,6 +1249,19 @@ buf_read (struct sfm_reader *r, void *buf, size_t byte_cnt, size_t min_alloc)
   return buf;
 }
 
+/* Winds the reader BYTE_CNT bytes back in the reader stream.   */
+void
+buf_unread(struct sfm_reader *r, size_t byte_cnt)
+{
+  assert(byte_cnt > 0);
+
+  if ( 0 != fseek(r->file, -byte_cnt, SEEK_CUR))
+    {
+      msg (ME, _("%s: Seeking system file: %s."),
+	   handle_get_filename (r->fh), strerror (errno));
+    }
+}
+
 /* Reads a document record, type 6, from system file R, and sets up
    the documents and n_documents fields in the associated
    dictionary. */
@@ -1209,7 +1306,7 @@ buffer_input (struct sfm_reader *r)
   size_t amt;
 
   if (r->buf == NULL)
-    r->buf = xmalloc (sizeof *r->buf * 128);
+    r->buf = xnmalloc (128, sizeof *r->buf);
   amt = fread (r->buf, sizeof *r->buf, 128, r->file);
   if (ferror (r->file))
     {
@@ -1241,7 +1338,7 @@ read_compressed_data (struct sfm_reader *r, flt64 *buf)
 
   for (;;)
     {
-      for (; p < p_end; p++)
+      for (; p < p_end; p++){
 	switch (*p)
 	  {
 	  case 0:
@@ -1295,7 +1392,7 @@ read_compressed_data (struct sfm_reader *r, flt64 *buf)
 	      goto success;
 	    break;
 	  }
-
+      }
       /* We have reached the end of this instruction octet.  Read
 	 another. */
       if (r->ptr == NULL || r->ptr >= r->end)
@@ -1346,7 +1443,7 @@ sfm_read_case (struct sfm_reader *r, struct ccase *c)
         {
           int i;
           
-          for (i = 0; i < r->var_cnt; i++) 
+          for (i = 0; i < r->value_cnt; i++) 
             if (r->vars[i].width == 0)
               bswap_flt64 (&case_data_rw (c, r->vars[i].fv)->f);
         }
@@ -1358,7 +1455,7 @@ sfm_read_case (struct sfm_reader *r, struct ccase *c)
         {
           int i;
           
-          for (i = 0; i < r->var_cnt; i++) 
+          for (i = 0; i < r->value_cnt; i++) 
             if (r->vars[i].width == 0 && case_num (c, i) == r->sysmis)
               case_data_rw (c, r->vars[i].fv)->f = SYSMIS;
         }
@@ -1386,7 +1483,7 @@ sfm_read_case (struct sfm_reader *r, struct ccase *c)
           return 0;
         }
 
-      for (i = 0; i < r->var_cnt; i++)
+      for (i = 0; i < r->value_cnt; i++)
         {
           struct sfm_var *v = &r->vars[i];
 
@@ -1395,9 +1492,9 @@ sfm_read_case (struct sfm_reader *r, struct ccase *c)
               flt64 f = *bounce_cur++;
               if (r->reverse_endian)
                 bswap_flt64 (&f);
-              case_data_rw (c, i)->f = f == r->sysmis ? SYSMIS : f;
+              case_data_rw (c, v->fv)->f = f == r->sysmis ? SYSMIS : f;
             }
-          else 
+          else if (v->width != -1)
             {
               memcpy (case_data_rw (c, v->fv)->s, bounce_cur, v->width);
               bounce_cur += DIV_RND_UP (v->width, sizeof (flt64));