From b5aa871b580abfdf520d08e7581a18d1f16a97dc Mon Sep 17 00:00:00 2001 From: handa Date: Wed, 16 Jan 2008 05:19:21 +0000 Subject: [PATCH] (otf_check_features): Check the return value of pango_ot_info_find_language. Check info before accessing info->ruleset. --- m17n-fc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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, -- 1.7.10.4