ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #336 from dicej/builtinelement-dispose

Browse Source 
fix segfault in BuiltinElement::dispose
This commit is contained in:
Joshua Warner 2014-09-15 09:33:55 -06:00
commit fa2ab168ce
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/finder.cpp
View File

@ -615,6 +615,7 @@ class BuiltinElement : public JarElement {
const char* name, const char* name,
const char* libraryName) const char* libraryName)
: JarElement(s, allocator, name, false), : JarElement(s, allocator, name, false),
library(0),
libraryName(libraryName ? copy(allocator, libraryName) : 0) libraryName(libraryName ? copy(allocator, libraryName) : 0)
{ {
} }
@ -657,6 +658,8 @@ class BuiltinElement : public JarElement {
} else if (DebugFind) { } else if (DebugFind) {
fprintf(stderr, "unable to find %s in %s\n", symbolName, libraryName); 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() virtual void dispose()
{ {
library->disposeAll(); if (library) {
library->disposeAll();
}
if (libraryName) { if (libraryName) {
allocator->free(libraryName, strlen(libraryName) + 1); allocator->free(libraryName, strlen(libraryName) + 1);
} }