From ce91905b33dd6fbecda2be4d32bb0d06ec472759 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Mon, 15 Sep 2014 09:00:22 -0600
Subject: [PATCH] fix segfault in BuiltinElement::dispose

If a BuiltinElement is never used (i.e. we never try to load anything
from it), its init method will never be called, and thus its backing
library will never be loaded.  In that case, we should not try to call
library->disposeAll() in the destructor.
---
 src/finder.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/finder.cpp b/src/finder.cpp
index 59479a2534..32147e5e1b 100644
--- a/src/finder.cpp
+++ b/src/finder.cpp
@@ -615,6 +615,7 @@ class BuiltinElement : public JarElement {
                  const char* name,
                  const char* libraryName)
       : JarElement(s, allocator, name, false),
+        library(0),
         libraryName(libraryName ? copy(allocator, libraryName) : 0)
   {
   }
@@ -657,6 +658,8 @@ class BuiltinElement : public JarElement {
         } else if (DebugFind) {
           fprintf(stderr, "unable to find %s in %s\n", symbolName, libraryName);
         }
+      } else if (DebugFind) {
+        fprintf(stderr, "unable to load %s\n", libraryName);
       }
     }
   }
@@ -673,7 +676,9 @@ class BuiltinElement : public JarElement {
 
   virtual void dispose()
   {
-    library->disposeAll();
+    if (library) {
+      library->disposeAll();
+    }
     if (libraryName) {
       allocator->free(libraryName, strlen(libraryName) + 1);
     }