commit ac274331c285e1b42632870e150e1d66a9e21933
author Behdad Esfahbod <behdad@behdad.org> Mon Jan 09 22:20:38 2017 -0800
committer Behdad Esfahbod <behdad@behdad.org> Mon Jan 09 22:20:38 2017 -0800
tree cc797ce78f98fb296f9ae09f8163ab44b9e372ef
parent 29fb0cb727555ea60460d794a3c6f30179546af9

In lazy-loading, remember allocation failure

src/hb-ot-font.cc

diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 5be055d..c243136 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -447,11 +447,13 @@
     {
       p = (T *) calloc (1, sizeof (T));
       if (unlikely (!p))
-        return &OT::Null(T);
-      p->init (face);
+        p = const_cast<T *> (&OT::Null(T));
+      else
+	p->init (face);
       if (unlikely (!hb_atomic_ptr_cmpexch (const_cast<T **>(&instance), NULL, p)))
       {
-	p->fini ();
+	if (p != &OT::Null(T))
+	  p->fini ();
 	goto retry;
       }
     }