Jacek Caban : usp10: Check if corresponding headers are present before accessing their feature lists in _initialize_feature_cache.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 45538716142d80c68983d065149c1a4404edaafc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=45538716142d80c68983d06514...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Mar 31 16:50:54 2017 +0200

usp10: Check if corresponding headers are present before accessing their feature lists in _initialize_feature_cache.

Based on feedback from Henri, fixes regression from commit
63bcfa3354edd910ee52b8134af191f7a774b701.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Aric Stewart <aric(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/usp10/opentype.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index a8b3975..889aa8a 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -2832,13 +2832,17 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language
     if (language->features_initialized)
         return;
 
-    feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList));
     if ((lang = language->gsub_table))
+    {
+        feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList));
         usp10_language_add_feature_list(language, FEATURE_GSUB_TABLE, lang, feature_list);
+    }
 
-    feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList));
     if ((lang = language->gpos_table))
+    {
+        feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList));
         usp10_language_add_feature_list(language, FEATURE_GPOS_TABLE, lang, feature_list);
+    }
 
     language->features_initialized = TRUE;
 }