commit 61924e2673f71486ca93e4c2196fdf4582ab10a6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 08 17:18:53 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 08 17:18:53 2023 +0000
tree bef33f3f97982b201c0c4d1b26ac7cdcafc9cb02
parent 6711d4064b217e4d28a0c69c00ef77116b20ce58
parent 530ece82d654a35c0f4aabf223b623dd7a9609e6

Snap for 10276566 from 530ece82d654a35c0f4aabf223b623dd7a9609e6 to tm-platform-release

Change-Id: Ic184f240ffaeebe414d113019a6b5573fdb58f41

src/base/ftobjs.c

diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 883f1a8..46baf5f 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2451,6 +2451,15 @@
 #endif
 
 
+    /* only use lower 31 bits together with sign bit */
+    if ( face_index > 0 )
+      face_index &= 0x7FFFFFFFL;
+    else
+    {
+      face_index &= 0x7FFFFFFFL;
+      face_index  = -face_index;
+    }
+
 #ifdef FT_DEBUG_LEVEL_TRACE
     FT_TRACE3(( "FT_Open_Face: " ));
     if ( face_index < 0 )
@@ -3323,6 +3332,9 @@
     if ( !face )
       return FT_THROW( Invalid_Face_Handle );
 
+    if ( !face->size )
+      return FT_THROW( Invalid_Size_Handle );
+
     if ( !req || req->width < 0 || req->height < 0 ||
          req->type >= FT_SIZE_REQUEST_TYPE_MAX )
       return FT_THROW( Invalid_Argument );

src/sfnt/sfobjs.c

diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 7891024..ea17ca8 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -566,7 +566,7 @@
     face_index = FT_ABS( face_instance_index ) & 0xFFFF;
 
     /* value -(N+1) requests information on index N */
-    if ( face_instance_index < 0 )
+    if ( face_instance_index < 0 && face_index > 0 )
       face_index--;
 
     if ( face_index >= face->ttc_header.count )

src/sfnt/sfwoff2.c

diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 5ee8dea..2da697d 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -2086,7 +2086,7 @@
     /* Validate requested face index. */
     *num_faces = woff2.num_fonts;
     /* value -(N+1) requests information on index N */
-    if ( *face_instance_index < 0 )
+    if ( *face_instance_index < 0 && face_index > 0 )
       face_index--;
 
     if ( face_index >= woff2.num_fonts )