From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 6 Jan 2016 01:47:35 +0000 (-0800)
Subject: APPLY DICTIONARY: Fix segmentation fault when setting value labels.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=317c8374ac805fd00048a6e2baefcdf72b9e50c2

APPLY DICTIONARY: Fix segmentation fault when setting value labels.

Reported by Frans Houweling.
---

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index c949510f65..f419febcb4 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2014, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
 
   for (i = 0; i < dict_get_var_cnt (dict); i++)
     {
-      struct variable *s = dict_get_var (dict, i);
+      const struct variable *s = dict_get_var (dict, i);
       struct variable *t = dict_lookup_var (dataset_dict (ds),
                                             var_get_name (s));
       if (t == NULL)
@@ -86,7 +86,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
         {
           const struct val_labs *value_labels = var_get_value_labels (s);
           if (val_labs_can_set_width (value_labels, var_get_width (t)))
-            var_set_value_labels (s, value_labels);
+            var_set_value_labels (t, value_labels);
         }
 
       if (var_has_missing_values (s))