projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash on text import dialog
[pspp-builds.git]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index 4baa99e014b169426e69fd978850bf27e9b9992e..6f33ff6d8bb8b6547a76a91bc06d35260a3a1881 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-1543,6
+1543,7
@@
init_formats_page (struct import_assistant *ia)
p->data_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "data"));
p->modified_vars = NULL;
p->modified_var_cnt = 0;
p->data_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "data"));
p->modified_vars = NULL;
p->modified_var_cnt = 0;
+ p->dict = NULL;
}
/* Frees IA's formats substructure. */
}
/* Frees IA's formats substructure. */
@@
-1748,9
+1749,9
@@
parse_field (struct import_assistant *ia,
if (field.string != NULL)
{
msg_disable ();
if (field.string != NULL)
{
msg_disable ();
- /* FIXME: NULL should be replaced with the destination dictionary */
+
if (!data_in (field, LEGACY_NATIVE, in->type, 0, 0, 0,
if (!data_in (field, LEGACY_NATIVE, in->type, 0, 0, 0,
-
NULL
,
+
ia->formats.dict
,
&val, var_get_width (var)))
{
char fmt_string[FMT_STRING_LEN_MAX + 1];
&val, var_get_width (var)))
{
char fmt_string[FMT_STRING_LEN_MAX + 1];