Don't crash on out-of-BMP values.

Fri Mar  1 14:25:22 2002  Owen Taylor  <otaylor@redhat.com>

        * pango/modules.c: Don't crash on out-of-BMP values.

        * pango/mini-fribidi/fribidi_get_type.c (_pango_fribidi_get_type):
        Return FRIBIDI_TYPE_LTR for all non-BMP characters.

1 files changed, 24 insertions, 7 deletions

diff --git a/pango/modules.c b/pango/modules.c
index f280920f..b4346f4c 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -500,7 +500,7 @@ build_map (PangoMapInfo *info)
   init_modules();
 
   info->map = map = g_new (PangoMap, 1);
-  map->n_submaps = 0;
+  map->n_submaps = 256;
   for (i=0; i<256; i++)
     {
       map->submaps[i].is_leaf = TRUE;
@@ -530,8 +530,18 @@ PangoMapEntry *
 pango_map_get_entry (PangoMap   *map,
 		     guint32     wc)
 {
-  PangoSubmap *submap = &map->submaps[wc / 256];
-  return submap->is_leaf ? &submap->d.entry : &submap->d.leaves[wc % 256];
+  int i = wc / 256;
+
+  if (i < map->n_submaps)
+    {
+      PangoSubmap *submap = &map->submaps[i];
+      return submap->is_leaf ? &submap->d.entry : &submap->d.leaves[wc % 256];
+    }
+  else
+    {
+      static PangoMapEntry default_entry = { NULL, FALSE };
+      return &default_entry;
+    }
 }
 
 /**
@@ -549,11 +559,18 @@ PangoEngine *
 pango_map_get_engine (PangoMap *map,
 		      guint32   wc)
 {
-  PangoSubmap *submap = &map->submaps[wc / 256];
-  PangoMapEntry *entry = submap->is_leaf ? &submap->d.entry : &submap->d.leaves[wc % 256];
+  int i = wc / 256;
 
-  if (entry->info)
-    return pango_engine_pair_get_engine ((PangoEnginePair *)entry->info);
+  if (i < map->n_submaps)
+    {
+      PangoSubmap *submap = &map->submaps[i];
+      PangoMapEntry *entry = submap->is_leaf ? &submap->d.entry : &submap->d.leaves[wc % 256];
+      
+      if (entry->info)
+	return pango_engine_pair_get_engine ((PangoEnginePair *)entry->info);
+      else
+	return NULL;
+    }
   else
     return NULL;
 }