diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-07-17 20:37:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-07-17 20:37:00 (GMT) |
| commit | 243677b26030126b72b860fa100bfcfed3654cbe (patch) | |
| tree | 97a449697fcb8e062d72dd86452fa2b3f7121e9d /generic/tclZlib.c | |
| parent | 74b54ec4591961cd0bdfb487dfc7fdf067962ba8 (diff) | |
| parent | 0cb480df70afc69c2a1637894dddd3f0b4e6d351 (diff) | |
| download | tcl-243677b26030126b72b860fa100bfcfed3654cbe.zip tcl-243677b26030126b72b860fa100bfcfed3654cbe.tar.gz tcl-243677b26030126b72b860fa100bfcfed3654cbe.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclZlib.c')
| -rw-r--r-- | generic/tclZlib.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c index 648fb22..40943bc 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -643,7 +643,6 @@ Tcl_ZlibStreamInit( int e; ZlibStreamHandle *zshPtr = NULL; Tcl_DString cmdname; - Tcl_CmdInfo cmdinfo; GzipHeader *gzHeaderPtr = NULL; switch (mode) { @@ -769,8 +768,8 @@ Tcl_ZlibStreamInit( Tcl_DStringInit(&cmdname); TclDStringAppendLiteral(&cmdname, "::tcl::zlib::streamcmd_"); TclDStringAppendObj(&cmdname, Tcl_GetObjResult(interp)); - if (Tcl_GetCommandInfo(interp, Tcl_DStringValue(&cmdname), - &cmdinfo) == 1) { + if (Tcl_FindCommand(interp, Tcl_DStringValue(&cmdname), + NULL, 0) != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "BUG: Stream command name already exists", -1)); Tcl_SetErrorCode(interp, "TCL", "BUG", "EXISTING_CMD", NULL); @@ -2911,6 +2910,10 @@ ZlibTransformClose( * Release all memory. */ + if (cd->compDictObj) { + Tcl_DecrRefCount(cd->compDictObj); + cd->compDictObj = NULL; + } Tcl_DStringFree(&cd->decompressed); if (cd->inBuffer) { |