ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix segfault in BuiltinElement::dispose

Browse Source 
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.
This commit is contained in:
Joel Dice 2014-09-15 09:00:22 -06:00
parent a020105225
commit ce91905b33
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* 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);
}