X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=aadc585548582fc79629dca6b580e271ad6c7cde;hb=a34c42168e0cd3373860a6cc3f518cb0e329db47;hp=092de58cafa0ed89f827d61a617c9008a442e86a;hpb=537fdeb3702c011e05d7826a8d556a7beeba2605;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index 092de58c..aadc5855 100644
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006  Free Software Foundation
+   Copyright (C) 2006, 2009  Free Software Foundation
 
    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
@@ -484,10 +484,19 @@ psppire_var_store_set_string (PsppireSheetModel *model,
       break;
     case PSPPIRE_VAR_STORE_COL_WIDTH:
       {
-	int width = atoi (text);
-	if ( ! text) return FALSE;
+	const int width = atoi (text);
+	if ( ! text)
+	  return FALSE;
+
+	if (width < 0)
+	  return FALSE;
+
 	if ( var_is_alpha (pv))
+	  {
+	    if ( width > MAX_STRING )
+	      return FALSE;
 	    var_set_width (pv, width);
+	  }
 	else
 	  {
             bool for_input
@@ -688,20 +697,20 @@ text_for_column (PsppireVarStore *vs,
 	    gchar *ss;
 	    GString *gstr = g_string_sized_new (10);
 	    const struct val_labs *vls = var_get_value_labels (pv);
-	    struct val_labs_iterator *ip = 0;
-	    struct val_lab *vl = val_labs_first_sorted (vls, &ip);
+            const struct val_lab **labels = val_labs_sorted (vls);
+	    const struct val_lab *vl = labels[0];
+            free (labels);
 
 	    g_assert (vl);
 
 	    {
 	      gchar *const vstr = value_to_text (vl->value, *write_spec);
 
-	      g_string_printf (gstr, "{%s,\"%s\"}_", vstr, vl->label);
+	      g_string_printf (gstr, "{%s,\"%s\"}_",
+                               vstr, val_lab_get_label (vl));
 	      g_free (vstr);
 	    }
 
-	    val_labs_done (&ip);
-
 	    ss = recode_string (UTF8, psppire_dict_encoding (dict),
 				gstr->str, gstr->len);
 	    g_string_free (gstr, TRUE);