Skip to content

Rebase. #1

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

Merged
elmopl merged 7 commits into from
Nov 7, 2017
Merged

Rebase. #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d2903c
Fix symbol visibility of init method
marv Sep 4, 2017
8d37630
Fix warning: returning the proper type for object sizes
raffienficiaud Aug 15, 2017
2b7842a
Fix memory leaks in enum.cpp
elmopl Oct 24, 2017
7c5e478
Fix autoptr/unique_ptr ifdef for VS2017.
garyfurnish Aug 21, 2017
30c9eb1
Fix c++11 detection.
garyfurnish Aug 21, 2017
2d9871f
Fix unresolved symbol error with MSVC.
stefanseefeld Oct 27, 2017
bf9a033
Revert "Avoid multiple template instances of boost::python::details::…
stefanseefeld Oct 30, 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 leaks in enum.cpp 
Unfortunately due to optimised build of Python3 libraries and executable I got only partial stack from [http://clang.llvm.org/docs/AddressSanitizer.html], however digging into and reducing my code I tracked it down to be issue with `boost/libs/python/src/object/enum.cpp`.

It has to bits that leak (and comment mentioning there is one):

    PyObject *mod = PyObject_GetAttrString( self_, "__module__");

Leaks reference, as it never decreases it.
It also stores a new string object under object's `name` that ref count never gets decremented.

That commit fixes both issues.
  • Loading branch information
@elmopl @stefanseefeld
elmopl authored and stefanseefeld committed Oct 25, 2017
commit 2b7842a39f023e2aa2b401089dfeac0172844574
12 changes: 9 additions & 3 deletions src/object/enum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,17 @@ static PyMemberDef enum_members[] = {

extern "C"
{
static void
enum_dealloc(enum_object* self)
{
Py_XDECREF(self->name);
Py_TYPE(self)->tp_free((PyObject*)self);
}

static PyObject* enum_repr(PyObject* self_)
{
// XXX(bhy) Potentional memory leak here since PyObject_GetAttrString returns a new reference
// const char *mod = PyString_AsString(PyObject_GetAttrString( self_, const_cast<char*>("__module__")));
PyObject *mod = PyObject_GetAttrString( self_, "__module__");
object auto_free(handle<>(mod));
enum_object* self = downcast<enum_object>(self_);
if (!self->name)
{
Expand Down Expand Up @@ -88,7 +94,7 @@ static PyTypeObject enum_type_object = {
const_cast<char*>("Boost.Python.enum"),
sizeof(enum_object), /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
(destructor) enum_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
Expand Down