From: John Darrington Date: Sun, 12 Jul 2009 20:46:20 +0000 (+0800) Subject: Fix crash on text import dialog X-Git-Tag: build37~53^2~7 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff59ee87992b440aab8083ee041f9aecd2ce68ca;p=pspp-builds.git Fix crash on text import dialog --- diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c index 4baa99e0..6f33ff6d 100644 --- 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->dict = NULL; } /* Frees IA's formats substructure. */ @@ -1748,9 +1749,9 @@ parse_field (struct import_assistant *ia, 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, - NULL, + ia->formats.dict, &val, var_get_width (var))) { char fmt_string[FMT_STRING_LEN_MAX + 1];