From 693ae804743c60968d4339465fa6480e0ed8396c Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Thu, 2 Aug 2018 11:22:42 -0700
Subject: [PATCH] more silencing fixes

---
 src/hb-ot-cff2-table.hh | 2 +-
 src/hb-subset-cff2.cc   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hb-ot-cff2-table.hh b/src/hb-ot-cff2-table.hh
index 4fbb85da1..868dedd8d 100644
--- a/src/hb-ot-cff2-table.hh
+++ b/src/hb-ot-cff2-table.hh
@@ -48,7 +48,7 @@ struct CFF2VariationStore
 
   inline bool serialize (hb_serialize_context_t *c, const CFF2VariationStore *varStore)
   {
-    TRACE_SANITIZE (this);
+    TRACE_SERIALIZE (this);
     unsigned int size_ = varStore->get_size ();
     CFF2VariationStore *dest = c->allocate_size<CFF2VariationStore> (size_);
     if (unlikely (dest == nullptr)) return_trace (false);
diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc
index 8c79ac25a..5ccc965a5 100644
--- a/src/hb-subset-cff2.cc
+++ b/src/hb-subset-cff2.cc
@@ -144,6 +144,7 @@ struct CFF2PrivateDict_OpSerializer : OpSerializer
 
 struct subset_plan {
   inline subset_plan (void)
+    : final_size (0)
   {
     subset_charstrings.init ();
     private_off_and_size_pairs.init ();