tDOM: Check-in [7fca63fe3f]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	avoid usage of fallback to __tdomGC at global/NS level, this way it could prevent a leakage of tree in the global var __tdomGC (only affected if current level is global/NS)
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| fix-traced-gc-regression-of-091-cr1
Files:	files \| file ages \| folders
SHA3-256:	7fca63fe3fbc8867f273ed8a2f3414a8beb06627cd41603ca83214d02705defb
User & Date:	sebres 2019-03-15 15:17:37

Context

2019-03-15
15:17		avoid usage of fallback to __tdomGC at global/NS level, this way it could prevent a leakage of tree in the global var __tdomGC (only affected if current level is global/NS) Leaf check-in: 7fca63fe3f user: sebres tags: fix-traced-gc-regression-of-091-cr1
2019-03-14
16:16		accept tcl-test options like -load "load libtdom...; source ../lib/tdom.tcl" (allow to run test-suite from development environment, other tdom-version or uninstalled) Leaf check-in: 881efc6915 user: sebres tags: fix-traced-gc-regression-of-091

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tcldom.c.

    if (hasTrace) {
        dinfo->document = NULL;
    } else {
        FREE((void*)dinfo);
    }
}























/*----------------------------------------------------------------------------
|   tcldom_docTrace
|
\---------------------------------------------------------------------------*/
static
char * tcldom_docTrace (
................................................................................

    if (doc == NULL || (flags & TCL_TRACE_WRITES)) {
        if (!(flags & (TCL_TRACE_UNSETS|TCL_INTERP_DESTROYED))) {
            Tcl_UntraceVar2(dinfo->interp, name1, name2,
                           TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
                           tcldom_docTrace, clientData);
        }
        if (!(flags & TCL_TRACE_WRITES)) {
            FREE (dinfo);
            return NULL;
        }
    }

    DOC_CMD(objCmdName, doc);
    if (flags & TCL_TRACE_WRITES) {







        Tcl_TraceVar2(interp,"__tdomGC", objCmdName, TCL_TRACE_UNSETS,
                     (Tcl_VarTraceProc*)tcldom_docTrace,
                     clientData);
        return NULL;
    }

    DBG(fprintf(stderr, "--> tcldom_docTrace delete doc %p\n", doc));







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







|







>
>
>
>
>
>
>

    if (hasTrace) {
        dinfo->document = NULL;
    } else {
        FREE((void*)dinfo);
    }
}

/*----------------------------------------------------------------------------*/

static
int isProcCallFrame(
    Tcl_Interp *interp
) {
    int isproc = 1;
    /* retrieve frame info and check we're at proc-level */
    if (Tcl_Eval(interp, "info frame 0") == TCL_OK) {
        /* check proc is in info-dictionary */
        Tcl_Obj *value, *key = Tcl_NewStringObj("proc", 4);
        if ( Tcl_DictObjGet(NULL, Tcl_GetObjResult(interp), key, &value) != TCL_OK
          || (value == NULL)
        ) {
            /* global or namespace level: */
            isproc = 0;
        };
        Tcl_DecrRefCount(key);
    }
    return isproc;
}

/*----------------------------------------------------------------------------
|   tcldom_docTrace
|
\---------------------------------------------------------------------------*/
static
char * tcldom_docTrace (
................................................................................

    if (doc == NULL || (flags & TCL_TRACE_WRITES)) {
        if (!(flags & (TCL_TRACE_UNSETS|TCL_INTERP_DESTROYED))) {
            Tcl_UntraceVar2(dinfo->interp, name1, name2,
                           TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
                           tcldom_docTrace, clientData);
        }
        if (doc == NULL) {
            FREE (dinfo);
            return NULL;
        }
    }

    DOC_CMD(objCmdName, doc);
    if (flags & TCL_TRACE_WRITES) {
        /* avoid usage of fallback to __tdomGC at global/NS level */
        if (!isProcCallFrame(interp)) {
            /* prohibit change (and restore variable) */
            Tcl_SetVar2 (interp, name1, name2, objCmdName, TCL_LEAVE_ERR_MSG);
            return "var is read-only";
        }
        /* save reference in temp GC-array (deleted at end of frame-scope) */
        Tcl_TraceVar2(interp,"__tdomGC", objCmdName, TCL_TRACE_UNSETS,
                     (Tcl_VarTraceProc*)tcldom_docTrace,
                     clientData);
        return NULL;
    }

    DBG(fprintf(stderr, "--> tcldom_docTrace delete doc %p\n", doc));