[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-machinery-private.hh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 883957688cc4aa4335e5131a60b3ac3b53290726
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 8 21:42:18 2018 -0700

    Fix assertion failure
    
    https://bugzilla.mozilla.org/show_bug.cgi?id=1476334

diff --git a/src/hb-machinery-private.hh b/src/hb-machinery-private.hh
index 119625c4..39a7fd1f 100644
--- a/src/hb-machinery-private.hh
+++ b/src/hb-machinery-private.hh
@@ -639,7 +639,8 @@ struct hb_lazy_loader_t
 
   inline void set_stored (Stored *instance_)
   {
-    assert (instance == nullptr);
+    if (instance)
+      thiz ()->destroy (instance);
     instance = instance_;
   }