Fix crash when cleaning up after parsing bad MODIFY VARIABLES.

[pspp] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index c5f7883913e2c606f33e33f1151c5970b3d412c1..40cd8e53878c43c04f089fad3373584aeef10774 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013  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
@@ -40,7 +40,6 @@
 #include <data/settings.h>
 
 #include "psppire-data-store.h"
-#include "psppire.h"
 
 #include "gl/configmake.h"
 #include "xalloc.h"
@@ -96,7 +95,7 @@ value_to_text__ (union value v,
 {
   gchar *s;
 
-  s = data_out (&v, encoding, format);
+  s = data_out_stretchy (&v, encoding, format, NULL);
   if (fmt_is_numeric (format->type))
     g_strchug (s);
   else
@@ -118,29 +117,52 @@ text_to_value (const gchar *text,
               const struct variable *var,
               union value *val)
 {
-  const struct fmt_spec *format = var_get_print_format (var);
-  int width = var_get_width (var);
+  return text_to_value__ (text, var_get_print_format (var),
+                          var_get_encoding (var), val);
+}
+
+/* Converts TEXT, which contains a value in the given FORMAT encoding in
+   ENCODING, into a value.
 
-  if ( format->type != FMT_A)
+   VAL will be initialised and filled by this function.
+   It is the caller's responsibility to destroy VAL when no longer needed.
+
+   On success, VAL is returned, NULL otherwise.
+*/
+union value *
+text_to_value__ (const gchar *text,
+                 const struct fmt_spec *format,
+                 const gchar *encoding,
+                 union value *val)
+{
+  int width = fmt_var_width (format);
+
+  if (format->type != FMT_A)
     {
-      if ( ! text ) return NULL;
+      if (! text) return NULL;
 
       {
        const gchar *s = text;
        while (*s)
          {
-           if ( !isspace (*s))
+           if (!isspace (*s))
              break;
            s++;
          }
 
-       if ( !*s) return NULL;
+       if (!*s) return NULL;
       }
     }
 
   value_init (val, width);
-  free (data_in (ss_cstr (text), UTF8, format->type, val, width,
-                 var_get_encoding (var)));
+  char *err = data_in (ss_cstr (text), UTF8, format->type, val, width, encoding);
+
+  if (err)
+    {
+      value_destroy (val, width);
+      val = NULL;
+      free (err);
+    }
 
   return val;
 }
@@ -197,20 +219,20 @@ connect_help (GtkBuilder *xml)
   GSList *helps = gtk_builder_get_objects (xml);
 
   GSList *i;
-  for ( i = helps; i ; i = g_slist_next (i))
+  for (i = helps; i ; i = g_slist_next (i))
     {
       GObject *o = i->data;
-      if ( GTK_IS_WIDGET (o) )
+      if (GTK_IS_WIDGET (o))
        {
          const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o));
          gchar s[12] = {0};
 
-         if ( name)
+         if (name)
            strncpy (s, name, 11);
          s[11] = '\0';
 
 
-         if ( 0 == strcmp ("help_button", s))
+         if (0 == strcmp ("help_button", s))
            {
            g_signal_connect (o, "clicked", give_help, 0);
            }
@@ -234,7 +256,7 @@ clone_list_store (const GtkListStore *src)
   int row = 0;
   GtkListStore *dest;
 
-  for (i = 0 ; i < n_cols; ++i )
+  for (i = 0 ; i < n_cols; ++i)
     types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i);
 
   dest = gtk_list_store_newv (n_cols, types);
@@ -247,7 +269,7 @@ clone_list_store (const GtkListStore *src)
       GtkTreeIter dest_iter;
       gtk_list_store_append  (dest, &dest_iter);
 
-      for (i = 0 ; i < n_cols; ++i )
+      for (i = 0 ; i < n_cols; ++i)
        {
          GValue val = {0};
 
@@ -267,7 +289,7 @@ clone_list_store (const GtkListStore *src)
 
 
 
-static gboolean 
+static gboolean
 on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
 {
   *addr = NULL;
@@ -282,7 +304,7 @@ paste_syntax_to_window (gchar *syntax)
 
   GtkTextBuffer *buffer = NULL;
 
-  if ( NULL == the_syntax_pasteboard)
+  if (NULL == the_syntax_pasteboard)
     {
       the_syntax_pasteboard = psppire_syntax_window_new (NULL);
       g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),