From: handa <handa>
Date: Fri, 19 Nov 2004 02:41:22 +0000 (+0000)
Subject: (reset_ic): Check if ic_info->state is NULL.
X-Git-Tag: REL-1-2-0~84
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56b428375e15787e4aa23844a75a8d68b13a6229;p=m17n%2Fm17n-lib.git

(reset_ic): Check if ic_info->state is NULL.
(filter): If ic_info->state is NULL, return 0.
---

diff --git a/src/input.c b/src/input.c
index 20b9184..42fa7a5 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1507,16 +1507,16 @@ reset_ic (MInputContext *ic)
 
   MLIST_RESET (ic_info);
   ic_info->state = (MIMState *) MPLIST_VAL (im_info->states);
-  ic_info->map = ic_info->state->map;
+  ic_info->map = ic_info->state ? ic_info->state->map : NULL;
   ic_info->state_key_head = ic_info->key_head = 0;
   ic->cursor_pos = ic_info->state_pos = 0;
-  ic->status = ic_info->state->title;
+  ic->status = ic_info->state ? ic_info->state->title : NULL;
   if (! ic->status)
     ic->status = im_info->title;
   ic->candidate_list = NULL;
   ic->candidate_show = 0;
   ic->status_changed = ic->preedit_changed = ic->candidates_changed = 1;
-  if (ic_info->map->map_actions)
+  if (ic_info->map && ic_info->map->map_actions)
     take_action_list (ic, ic_info->map->map_actions);
 }
 
@@ -1672,6 +1672,11 @@ filter (MInputContext *ic, MSymbol key, void *arg)
   MInputContextInfo *ic_info = (MInputContextInfo *) ic->info;
   int i = 0;
 
+  if (! ic_info->state)
+    {
+      ic_info->key_unhandled = 1;
+      return 0;
+    }
   mtext_reset (ic->produced);
   ic->status_changed = ic->preedit_changed = ic->candidates_changed = 0;
   MLIST_APPEND1 (ic_info, keys, key, MERROR_IM);