commit e0843e47c2daaa7a103580b544a847e00ee67e58
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 06 03:17:29 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 06 03:17:29 2023 +0000
tree bef33f3f97982b201c0c4d1b26ac7cdcafc9cb02
parent 462f9fc43d16b984f3cd0a420fc4f48a8008af73
parent db82c946f712b317bd86ce8f05e1643f92b3eb02

Merge "Cherry-pick one upstream change" into tm-qpr-dev

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 )