X-Git-Url: http://git.chise.org/gitweb/?p=m17n%2Fm17n-pango.git;a=blobdiff_plain;f=m17n-fc.c;fp=m17n-fc.c;h=9989d18a226a939933cdf54f872beeff23cee294;hp=c6a24aa3e7ad1cf9aa78bcf139549a8ba69c54d5;hb=b5aa871b580abfdf520d08e7581a18d1f16a97dc;hpb=32a02783656a40d07e8978eb76753adbdc62f73d

diff --git a/m17n-fc.c b/m17n-fc.c
index c6a24aa..9989d18 100644
--- a/m17n-fc.c
+++ b/m17n-fc.c
@@ -212,10 +212,14 @@ otf_check_features (PangoOTInfo *ot_info, PangoOTTableType type,
   langsys_tag = spec->langsys;
   if (! langsys_tag)
     langsys_tag = PANGO_OT_DEFAULT_LANGUAGE;
-  pango_ot_info_find_language (ot_info, type, script_idx,
-			       langsys_tag, &langsys_idx, &index);
+  if (! pango_ot_info_find_language (ot_info, type, script_idx,
+				     langsys_tag, &langsys_idx, &index))
+    {
+      langsys_idx = PANGO_OT_DEFAULT_LANGUAGE;
+      index = 0xFFFF;
+    }
 
-  if (index != 0xFFFF)
+  if (info && index != 0xFFFF)
     {
       info->ruleset[for_gpos] = pango_ot_ruleset_new (ot_info);
       pango_ot_ruleset_add_feature (info->ruleset[for_gpos], type,