From 180a88a96ce327e4103df3635c73559de65d1546 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 13 Sep 2018 19:19:57 +0200
Subject: [PATCH] [dfont] Some more

---
 src/hb-open-file.hh | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/hb-open-file.hh b/src/hb-open-file.hh
index 89b76d82d..5c653fed2 100644
--- a/src/hb-open-file.hh
+++ b/src/hb-open-file.hh
@@ -322,7 +322,8 @@ struct ResourceRecord
 
 struct ResourceTypeRecord
 {
-  inline unsigned int get_resource_count (void) const { return tag == HB_TAG_sfnt ? resCountM1 + 1 : 0; }
+  inline unsigned int get_resource_count (void) const
+  { return tag == HB_TAG_sfnt ? resCountM1 + 1 : 0; }
 
   inline bool is_sfnt (void) const { return tag == HB_TAG_sfnt; }
 
@@ -363,14 +364,6 @@ struct ResourceMap
 					   get_type_count ()) [i];
   }
 
-  inline unsigned int get_type_count (void) const { return typeCountM1 + 1; }
-
-  inline const ResourceRecord &get_resource_record (const ResourceTypeRecord &type,
-						    unsigned int i) const
-  {
-    return type.get_resource_record (i, &(this+typeListZ));
-  }
-
   inline unsigned int get_face_count (void) const
   {
     unsigned int count = get_type_count ();
@@ -390,11 +383,10 @@ struct ResourceMap
     for (unsigned int i = 0; i < count; i++)
     {
       const ResourceTypeRecord& type = get_type_record (i);
+      /* The check for idx < count is here because ResourceRecord is NOT null-safe.
+       * Because an offset of 0 there does NOT mean null. */
       if (type.is_sfnt () && idx < type.get_resource_count ())
-      {
-	const OpenTypeFontFace &face = get_resource_record (type, idx).get_face (data_base);
-	return face;
-      }
+	return type.get_resource_record (idx, &(this+typeListZ)).get_face (data_base);
     }
     return Null (OpenTypeFontFace);
   }
@@ -410,6 +402,9 @@ struct ResourceMap
 				      data_base));
   }
 
+  private:
+  inline unsigned int get_type_count (void) const { return typeCountM1 + 1; }
+
   protected:
   HBUINT8	reserved0[16];	/* Reserved for copy of resource header */
   HBUINT32	reserved1;	/* Reserved for handle to next resource map */