summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Mullender <sjoerd@acm.org>1993-08-03 15:11:36 (GMT)
committerSjoerd Mullender <sjoerd@acm.org>1993-08-03 15:11:36 (GMT)
commitf64992e95d3b87799d4a423d2d0c0047b177c56b (patch)
tree9dbebed108d638dba7f761dcd2d441c8419987e8
parentd29eb6232cf7d71e5f5bffd70668b3e18835797a (diff)
downloadcpython-f64992e95d3b87799d4a423d2d0c0047b177c56b.zip
cpython-f64992e95d3b87799d4a423d2d0c0047b177c56b.tar.gz
cpython-f64992e95d3b87799d4a423d2d0c0047b177c56b.tar.bz2
* clmodule.c (doParams): free PVbuffer in error condition.
* frameobject.c (newframeobject): initialize ob_type if taking entry from the free list, since it is zeroed out when DEBUG is defined.
-rw-r--r--Modules/clmodule.c4
-rw-r--r--Objects/frameobject.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/Modules/clmodule.c b/Modules/clmodule.c
index a9a378e..63e81db 100644
--- a/Modules/clmodule.c
+++ b/Modules/clmodule.c
@@ -365,8 +365,10 @@ doParams(clobject *self, object *args, int (*func)(CL_Handle, int *, int),
error_handler_called = 0;
(*func)(self->ob_compressorHdl, PVbuffer, length);
- if (error_handler_called)
+ if (error_handler_called) {
+ DEL(PVbuffer);
return NULL;
+ }
if (modified) {
for (i = 0; i < length; i++) {
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 62a18e2..0b5e75c 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -137,6 +137,7 @@ newframeobject(back, code, globals, locals, owner, nvalues, nblocks)
else {
f = free_list;
free_list = free_list->f_back;
+ f->ob_type = &Frametype;
NEWREF(f);
}
if (f != NULL) {