Skip to content

Z
Zope
Commit d49cb7ca authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Fixed memory leak affecting methods (and other bindable attributes) of 

(dynamic) classes.

Updated copyright date.
parent 3b37a997
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
lib/Components/ExtensionClass/ExtensionClass.c
View file @ d49cb7ca
/* /*
Copyright (c) 1996-1998, Digital Creations, Fredericksburg, VA, USA. Copyright (c) 1996-2000, Digital Creations, Fredericksburg, VA, USA.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE. DAMAGE.
$Id: ExtensionClass.c,v 1.40 2000/11/04 16:18:56 jim Exp $ $Id: ExtensionClass.c,v 1.41 2000/12/26 15:20:23 jim Exp $
If you have questions regarding this software, If you have questions regarding this software,
contact: contact:
...@@ -54,7 +54,7 @@ static char ExtensionClass_module_documentation[] = ...@@ -54,7 +54,7 @@ static char ExtensionClass_module_documentation[] =
" - They provide access to unbound methods,\n" " - They provide access to unbound methods,\n"
" - They can be called to create instances.\n" " - They can be called to create instances.\n"
"\n" "\n"
"$Id: ExtensionClass.c,v 1.40 2000/11/04 16:18:56 jim Exp $\n" "$Id: ExtensionClass.c,v 1.41 2000/12/26 15:20:23 jim Exp $\n"
; ;
#include <stdio.h> #include <stdio.h>
...@@ -704,6 +704,7 @@ bindPMethod(PMethod *m, PyObject *inst) ...@@ -704,6 +704,7 @@ bindPMethod(PMethod *m, PyObject *inst)
Py_INCREF(inst); Py_INCREF(inst);
Py_INCREF(m->type); Py_INCREF(m->type);
Py_INCREF(m->meth);
self->type=m->type; self->type=m->type;
self->self=inst; self->self=inst;
self->meth=m->meth; self->meth=m->meth;
...@@ -733,6 +734,7 @@ PMethod_dealloc(PMethod *self) ...@@ -733,6 +734,7 @@ PMethod_dealloc(PMethod *self)
#endif #endif
Py_XDECREF(self->type); Py_XDECREF(self->type);
Py_XDECREF(self->self); Py_XDECREF(self->self);
Py_XDECREF(self->meth);
self->self=(PyObject*)freePMethod; self->self=(PyObject*)freePMethod;
freePMethod=self; freePMethod=self;
#ifdef TRACE_DEALLOC #ifdef TRACE_DEALLOC
...@@ -3521,7 +3523,7 @@ void ...@@ -3521,7 +3523,7 @@ void
initExtensionClass() initExtensionClass()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.40 $"; char *rev="$Revision: 1.41 $";
PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL); PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL);
PMethodType.ob_type=&PyType_Type; PMethodType.ob_type=&PyType_Type;
......
lib/Components/ExtensionClass/src/ExtensionClass.c
View file @ d49cb7ca
/* /*
Copyright (c) 1996-1998, Digital Creations, Fredericksburg, VA, USA. Copyright (c) 1996-2000, Digital Creations, Fredericksburg, VA, USA.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE. DAMAGE.
$Id: ExtensionClass.c,v 1.40 2000/11/04 16:18:56 jim Exp $ $Id: ExtensionClass.c,v 1.41 2000/12/26 15:20:23 jim Exp $
If you have questions regarding this software, If you have questions regarding this software,
contact: contact:
...@@ -54,7 +54,7 @@ static char ExtensionClass_module_documentation[] = ...@@ -54,7 +54,7 @@ static char ExtensionClass_module_documentation[] =
" - They provide access to unbound methods,\n" " - They provide access to unbound methods,\n"
" - They can be called to create instances.\n" " - They can be called to create instances.\n"
"\n" "\n"
"$Id: ExtensionClass.c,v 1.40 2000/11/04 16:18:56 jim Exp $\n" "$Id: ExtensionClass.c,v 1.41 2000/12/26 15:20:23 jim Exp $\n"
; ;
#include <stdio.h> #include <stdio.h>
...@@ -704,6 +704,7 @@ bindPMethod(PMethod *m, PyObject *inst) ...@@ -704,6 +704,7 @@ bindPMethod(PMethod *m, PyObject *inst)
Py_INCREF(inst); Py_INCREF(inst);
Py_INCREF(m->type); Py_INCREF(m->type);
Py_INCREF(m->meth);
self->type=m->type; self->type=m->type;
self->self=inst; self->self=inst;
self->meth=m->meth; self->meth=m->meth;
...@@ -733,6 +734,7 @@ PMethod_dealloc(PMethod *self) ...@@ -733,6 +734,7 @@ PMethod_dealloc(PMethod *self)
#endif #endif
Py_XDECREF(self->type); Py_XDECREF(self->type);
Py_XDECREF(self->self); Py_XDECREF(self->self);
Py_XDECREF(self->meth);
self->self=(PyObject*)freePMethod; self->self=(PyObject*)freePMethod;
freePMethod=self; freePMethod=self;
#ifdef TRACE_DEALLOC #ifdef TRACE_DEALLOC
...@@ -3521,7 +3523,7 @@ void ...@@ -3521,7 +3523,7 @@ void
initExtensionClass() initExtensionClass()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.40 $"; char *rev="$Revision: 1.41 $";
PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL); PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL);
PMethodType.ob_type=&PyType_Type; PMethodType.ob_type=&PyType_Type;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7