From 9228db06f46908afd0e62f5964470c37c66ba91f Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Sat, 13 Oct 2018 17:25:09 -0700
Subject: [PATCH] added CFF1 Expert Encoding subset test & bug fixes

---
 src/hb-ot-cff1-table.hh                     |   8 +++++++-
 src/hb-subset-cff1.cc                       |  10 ++++++++--
 test/api/fonts/cff1_expert.2D,F6E9,FB00.otf | Bin 0 -> 3096 bytes
 test/api/fonts/cff1_expert.otf              | Bin 0 -> 3656 bytes
 test/api/test-subset-cff1.c                 |  21 +++++++++++++++++++++
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 test/api/fonts/cff1_expert.2D,F6E9,FB00.otf
 create mode 100644 test/api/fonts/cff1_expert.otf

diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh
index 71e6953..9b913e0 100644
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
@@ -1121,7 +1121,13 @@ struct cff1
     
       const OT::cff1 *cff = this->blob->as<OT::cff1> ();
       encoding = &Null(Encoding);
-      charset = &StructAtOffsetOrNull<Charset> (cff, topDict.CharsetOffset);
+      if (is_predef_charset ())
+        charset = &Null(Charset);
+      else
+      {
+        charset = &StructAtOffsetOrNull<Charset> (cff, topDict.CharsetOffset);
+        if (unlikely ((charset == &Null (Charset)) || !charset->sanitize (&sc))) { fini (); return; }
+      }
       if (is_CID ())
       {
         if (unlikely (charset == &Null(Charset))) { fini (); return; }
diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index 42b47f1..d2d65ed 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -615,12 +615,18 @@ struct cff_subset_plan {
     final_size += offsets.globalSubrsInfo.size;
 
     /* Encoding */
-    offsets.encodingOffset = final_size;
+    if (!subset_encoding && acc.is_predef_charset ())
+      offsets.encodingOffset = acc.topDict.EncodingOffset;
+    else
+      offsets.encodingOffset = final_size;
     if (subset_encoding)
       final_size += plan_subset_encoding (acc, plan);
 
     /* Charset */
-    offsets.charsetInfo.offset = final_size;
+    if (!subset_charset && acc.is_predef_charset ())
+      offsets.charsetInfo.offset = acc.topDict.CharsetOffset;
+    else
+      offsets.charsetInfo.offset = final_size;
     final_size += offsets.charsetInfo.size;
 
     /* FDSelect */
diff --git a/test/api/fonts/cff1_expert.2D,F6E9,FB00.otf b/test/api/fonts/cff1_expert.2D,F6E9,FB00.otf
new file mode 100644
index 0000000000000000000000000000000000000000..8c198b767af89581394d900f6d2e9b0ff5653961
GIT binary patch
literal 3096
zcmbVOU1%It6h3!mcau%FNn315A(jiZf7;A$wn-sP!KP`0p&=WyY3mPKC%co~CE1yE
zX11FY!GeOeMNp9DMW`=Aeel^wqfnnpKv1ktRS;=k6cKAB*!Z2fv)%1df7)5@z31ni
zbI;FrFPoW}$xximkxm;&$HwGSD|tag9}tO4nQSus!fz`d5orsMy^<@Nl|MFqUjTm%
z{JElK=DV(HSHKT|KTw1~|L*RuMEV5yCyHf%5i35uf~liyE><Wq#r$iSVzybfURpiB
z6a1S*?XOlG&tLzF(nOtipqGLo5fVad%{o;#XJt*>n{u7LX{%6OFkRN9dc|ARE8Z5p
z;(P+c1^sYBe;lzt-Hn;V#$Gzi?8(hMk8Pre5K-%!AJaxUrJTx=Cr#<QX5K2B?!0v7
z<VfC`wPbe5^R2Qc$L*ZsRvg##t-LJR(l1)_gk54T>q7{0JD+r1=|JPkoKv-Zw`6(7
zs8d;TONF8@)2aT{KAzLTJn(NP>?!(w<zO;dtJMsX12J+=Ik|VAtd;ztoVGm6J%gji
z9NU+ZsGr=e^4M*J`EZpa%7pZ(i~bTFoU<Nni(l+gzt@-VoL#=W{OR&%%kN>1t(BMC
zT4e2z#kYSrdpZ%nnCM*XxY4<KDUrBwDY4<s7hAZl7+Q3D$2D!?boZg(N!M@kao=9O
zcsf{b_8;dp{B+Xll-42Mr6`OqXwN}*T&?0|N{bzkc1CqQqH9_NI>9)pe<MeaWau#U
zt&#TgdJK5EE;dOLmsu}<(%#1+fnX@Y(F=;B<h29q1Vt!?wH-f>rtkKxHCkV9Q0rgE
zw?&l=g!mG{%(&){{q}_eesAAWgMF<*%tM{1U%&ecGvUWEG=D8Ta^zfzdc>|EUaoC7
zc(qTXHgJm8X%}q`=}6O_DDKOlP#&W#WOE#mIDC9bZ-lg<?P5HnHR=+Dkk)BJR6{z_
zv?oe=@p&kZ(UaQFkZz+DEfdo1G@y5fbewwh(U9(>wEkj9Z_uUwPDpprK<pDmBcYzy
z4<Rk+vDlv>t<l!D4I!<A-VxFf+T1qOg75GZNE@kiYMAjctTwc~5>RE196M>bUdgeg
z+Ff+~oMWGn{YJ{@PYn&1&3Vi5=d48w8wQO7gM&l+ALxueCW&&Vs2@WD5Or<<)ClFt
zp;@v(XK9H%@<EreN*YI7a?rX|31&0U<)PU_MbJLv2PuhPE%+H^-t%SzmSyPn(mq(!
zsD%ARP}A`5VYqY#GkY6@cN<zslkiZ6RLUMi<4_g5a%9PEWHj^GnZ-^!h;j;hoWN@V
z`xhX0k*$GTIp<+yc$AJ%22_*Bd-lq@uf<+jWng!VP6n}hh@Ye6+BJL^A@hSwZDb=+
zVb&QzrH6208PUwco_Eb*UF6&X4};isfClj!qWupMS#u5&F>#+v3?Er@^|^OkfqBRr
zocX97E(N)A$2j5>;JAOPUs+HJ3+i+m=O%HQ8=R?Zm}cx$Vac(TVCy00N5R_^PUFr>
zbke~5Oz8FhW6%e(D~MnQ`KX#TFvk_0LyWbcZk(;!v49oWL;Q?Z#wq8*73SRPmC53k
zOn}b>{uv()&lC4~;9Jm&CB_R6*%aCR=hmY!fiDyO7~iv)InKtNVg!t#w$Eba&K$&g
ze|0?M!d<99%Y9%xFJR@a70|s5>?c|xX=L(GHOj*azZmR!7WJtkMBNm=p?s4^fNy?H
zvbe_*cZzv%!Mkt@)C@YB0mf#aJq7JFej|7bW}rJ3*k&M+G>To5zyMo}2Q>TT$Qk96
z^gPz%(C{9vwuPt~Xyn^hL8OdB#;w9@3HPOfN-#e2LH=1#T-}H7ump~j*Sf72pdttF
za~L^z<^I{Icok~_=Wv{iOc!x*E$i=0<7Tl9N6EQxZ`C`*`T|blH`IkkzOMzymLTI-
zlhMk!t-k^s(SIS|cqGhZgPc6rs#|h4h{!?T)SFa7T#QA|V+4aS!V#+%gz@?yX#w`U
Xk1MDAj`Keb{zrpveHD-B1HQijZ@D^w

literal 0
HcmV?d00001

diff --git a/test/api/fonts/cff1_expert.otf b/test/api/fonts/cff1_expert.otf
new file mode 100644
index 0000000000000000000000000000000000000000..970ed6796d37aece743eec35a30163120951e280
GIT binary patch
literal 3656
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
P`pL{GVEA8WN$lXCf78Gr

literal 0
HcmV?d00001

diff --git a/test/api/test-subset-cff1.c b/test/api/test-subset-cff1.c
index 4d9190f..712e389 100644
--- a/test/api/test-subset-cff1.c
+++ b/test/api/test-subset-cff1.c
@@ -111,6 +111,26 @@ test_subset_cff1_j (void)
   hb_face_destroy (face_41_4c2e);
 }
 
+static void
+test_subset_cff1_expert (void)
+{
+  hb_face_t *face = hb_subset_test_open_font ("fonts/cff1_expert.otf");
+  hb_face_t *face_subset = hb_subset_test_open_font ("fonts/cff1_expert.2D,F6E9,FB00.otf");
+
+  hb_set_t *codepoints = hb_set_create ();
+  hb_set_add (codepoints, 0x2D);
+  hb_set_add (codepoints, 0xF6E9);
+  hb_set_add (codepoints, 0xFB00);
+  hb_face_t *face_test = hb_subset_test_create_subset (face, hb_subset_test_create_input (codepoints));
+  hb_set_destroy (codepoints);
+
+  hb_subset_test_check (face_subset, face_test, HB_TAG ('C','F','F',' '));
+
+  hb_face_destroy (face_test);
+  hb_face_destroy (face_subset);
+  hb_face_destroy (face);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -120,6 +140,7 @@ main (int argc, char **argv)
   hb_test_add (test_subset_cff1);
   hb_test_add (test_subset_cff1_strip_hints);
   hb_test_add (test_subset_cff1_j);
+  hb_test_add (test_subset_cff1_expert);
 
   return hb_test_run ();
 }
-- 
2.7.4