Skip to content

Fix exception propagation from module init and memory leak #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elmopl wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix exception propagation from module init and memory leak #175

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7f94e0
Fix memory leaks in enum.cpp
elmopl Oct 24, 2017
7c3240d
Fix error propagation in from module init.
elmopl Nov 7, 2017
1d19e6f
Fix memory leak in `gcc_demangle`
elmopl Nov 7, 2017
449fb2a
Merge pull request #1 from boostorg/develop
elmopl Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix memory leak in gcc_demangle 
`__cxa_demangle` returns a new pointer that needs to be freed.
As much as this is only a minor leak (tenths of bytes per each unique symbol that got resolved) it makes automated memory leak checking tools quite upset.
This simply adds a helper that frees memory for names we've kept.

Also, removed a lot of trailing whitespace.
  • Loading branch information
@elmopl
elmopl authored Nov 7, 2017
commit 1d19e6f5300523679e26fe73fff52dc77e92cdea
45 changes: 34 additions & 11 deletions src/converter/type_id.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

#include <boost/foreach.hpp>
#include <boost/python/type_id.hpp>
#include <boost/python/detail/decorated_type_id.hpp>
#include <utility>
Expand All @@ -18,9 +19,9 @@

#if !defined(__GNUC__) || __GNUC__ >= 3 || __SGI_STL_PORT || __EDG_VERSION__
# include <ostream>
#else
#else
# include <ostream.h>
#endif
#endif

# ifdef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
# if defined(__GNUC__) && __GNUC__ >= 3
Expand All @@ -34,7 +35,7 @@ class __class_type_info;

# include <cxxabi.h>
# endif
# endif
# endif
#endif /* defined(__QNXNTO__) */

namespace boost { namespace python {
Expand Down Expand Up @@ -76,18 +77,31 @@ namespace
return std::strcmp(x.first,y.first) < 0;
}
};

struct free_mem
{
free_mem(char*p)
: p(p) {}

~free_mem()
{
std::free(p);
}
char* p;
};

struct free_list
{
std::vector<char*> container;

~free_list()
{
BOOST_FOREACH(char * item, container)
{
free(item);
}
}
};
}

bool cxxabi_cxa_demangle_is_broken()
Expand All @@ -112,23 +126,25 @@ namespace detail
typedef std::vector<
std::pair<char const*, char const*>
> mangling_map;


static free_list demangler_free_mem;
static mangling_map demangler;

mangling_map::iterator p
= std::lower_bound(
demangler.begin(), demangler.end()
, std::make_pair(mangled, (char const*)0)
, compare_first_cstring());

if (p == demangler.end() || strcmp(p->first, mangled))
{
int status;
free_mem keeper(
cxxabi::__cxa_demangle(mangled, 0, 0, &status)
);

assert(status != -3); // invalid argument error

if (status == -1)
{
throw std::bad_alloc();
Expand Down Expand Up @@ -181,10 +197,17 @@ namespace detail
}

p = demangler.insert(p, std::make_pair(mangled, demangled));
keeper.p = 0;
// We are keeping demangled reference.
// Transfer ownership to helper list that will free it
// on teardown.
if (keeper.p == demangled)
{
demangler_free_mem.container.push_back(keeper.p);
keeper.p = 0;
}
}
}

return p->second;
}
}
Expand Down