X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=e022586dac71102ef4244505264f8c88eeba8a17;hb=06b59daf76fdd55f29302f02ea66e06b35043e5b;hp=a1fe6d75df294244fe11bc168c0120e2c77f57bd;hpb=31a3c6ef4eace636410353d32c41b2b3c6643fa5;p=pspp

diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index a1fe6d75df..e022586dac 100644
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -295,7 +295,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
                          "not be given in conjunction with the %s "
                          "subcommand."),
 		   "DROP", "KEEP"
-		   );
+		);
 	      goto done;
 	    }
 	  already_encountered |= 4;
@@ -307,7 +307,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
           vm.drop_vars = drop_vars;
           vm.n_drop = n_drop;
 
-          if (n_drop == dict_get_var_cnt (dataset_dict (ds)))
+          if (n_drop == dict_get_n_vars (dataset_dict (ds)))
             {
               msg (SE, _("%s may not be used to delete all variables "
                          "from the active dataset dictionary.  "
@@ -360,8 +360,9 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 done:
   free (vm.reorder_vars);
   free (vm.rename_vars);
-  for (size_t i = 0; i < vm.n_rename; i++)
-    free (vm.new_names[i]);
+  if (vm.new_names)
+    for (size_t i = 0; i < vm.n_rename; i++)
+      free (vm.new_names[i]);
   free (vm.new_names);
   free (vm.drop_vars);
   return ret_code;