From: Ben Pfaff <blp@gnu.org>
Date: Mon, 11 May 2009 13:33:15 +0000 (-0700)
Subject: gui: Fix segfault when pushing Del on a long string variable cell.
X-Git-Tag: v0.7.3~83
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c198ca9808879cdf1cff1cec664137d937c0a3c0;p=pspp-builds.git

gui: Fix segfault when pushing Del on a long string variable cell.

Thanks to John Darrington for reporting the problem.
---

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index 8808fd32..9ce07ae2 100644
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -653,12 +653,11 @@ psppire_data_store_clear_datum (PsppireSheetModel *model,
   PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
 
   union value v;
-  int width;
   const struct variable *pv = psppire_dict_get_variable (store->dict, col);
+  int width = var_get_width (pv);
 
   const gint index = var_get_case_index (pv) ;
 
-  width = var_is_numeric (pv) ? 0 : MAX_SHORT_STRING;
   value_init (&v, width);
   value_set_missing (&v, width);
   psppire_data_store_set_value (store, row, index, &v);