X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fmatrix-reader.c;h=05be57efcb892dd600deb5e51807c461fc70631e;hb=af8622f11c920a03269ad489617d86bfd568b287;hp=589a2989fa9a2e78401388d39866d86cbe45de02;hpb=7f0d18e1c856e42ef8fc910d785baace2900f7e6;p=pspp

diff --git a/src/language/data-io/matrix-reader.c b/src/language/data-io/matrix-reader.c
index 589a2989fa..05be57efcb 100644
--- a/src/language/data-io/matrix-reader.c
+++ b/src/language/data-io/matrix-reader.c
@@ -130,7 +130,7 @@ matrix_reader_create (const struct dictionary *dict,
       return NULL;
     }
 
-  for (size_t i = 0; i < dict_get_var_cnt (dict); i++)
+  for (size_t i = 0; i < dict_get_n_vars (dict); i++)
     {
       const struct variable *v = dict_get_var (dict, i);
       if (!var_is_numeric (v) && v != rowtype && v != varname)
@@ -353,7 +353,10 @@ cmd_debug_matrix_read (struct lexer *lexer, struct dataset *ds)
         mem_writer_create (dict_get_proto (dataset_dict (ds))));
       struct matrix_reader *mr = matrix_reader_create (dataset_dict (ds), cr);
       if (!mr)
-        return CMD_FAILURE;
+        {
+          casereader_destroy (cr);
+          return CMD_FAILURE;
+        }
       matrix_reader_destroy (mr);
       return CMD_SUCCESS;
     }