projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug which crashed gui if it attempted to enter invalid variable names.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-dict.c
diff --git
a/src/ui/gui/psppire-dict.c
b/src/ui/gui/psppire-dict.c
index 42025f2dc7598fe50f9cdb5dcff30f816ab14952..b32d0677ba9b04ab22663c312c73f3ec7e4b6017 100644
(file)
--- a/
src/ui/gui/psppire-dict.c
+++ b/
src/ui/gui/psppire-dict.c
@@
-343,13
+343,15
@@
psppire_dict_delete_variables (PsppireDict *d, gint first, gint n)
}
}
-void
+gboolean
psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
{
struct variable *var;
g_assert (d);
g_assert (PSPPIRE_IS_DICT (d));
psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
{
struct variable *var;
g_assert (d);
g_assert (PSPPIRE_IS_DICT (d));
+ if ( ! var_is_valid_name (name, false))
+ return FALSE;
if ( idx < dict_get_var_cnt (d->dict))
{
if ( idx < dict_get_var_cnt (d->dict))
{
@@
-362,6
+364,8
@@
psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
/* new variable */
dict_create_var (d->dict, name, 0);
}
/* new variable */
dict_create_var (d->dict, name, 0);
}
+
+ return TRUE;
}
}
@@
-735,11
+739,16
@@
tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter,
}
}
-void
+gboolean
psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
- const gchar *
text
)
+ const gchar *
name
)
{
{
- dict_rename_var (dict->dict, v, text);
+ if ( ! var_is_valid_name (name, false))
+ return FALSE;
+
+ dict_rename_var (dict->dict, v, name);
+
+ return TRUE;
}
}