diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-04-20 16:44:13 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-04-20 16:44:13 (GMT) |
| commit | 1bbd13e8395085f6afe23f0ac7d7cc91eae3cade (patch) | |
| tree | deba5d0dcb60194537aea304ca412bd52ef3c1b6 /generic/tclOOInfo.c | |
| parent | 66032e8a327e0498b0d8970307452f66c69be25c (diff) | |
| parent | 049650b5952e5e5ee1997772750450305dccc6d7 (diff) | |
| download | tcl-little.zip tcl-little.tar.gz tcl-little.tar.bz2 | |
Merge 8.6.5little
Diffstat (limited to 'generic/tclOOInfo.c')
| -rw-r--r-- | generic/tclOOInfo.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c index 0c22bcf..76eaef5 100644 --- a/generic/tclOOInfo.c +++ b/generic/tclOOInfo.c @@ -196,6 +196,9 @@ InfoObjectClassCmd( } FOREACH(mixinPtr, oPtr->mixins) { + if (!mixinPtr) { + continue; + } if (TclOOIsReachable(o2clsPtr, mixinPtr)) { Tcl_SetObjResult(interp, Tcl_NewIntObj(1)); return TCL_OK; @@ -467,6 +470,9 @@ InfoObjectIsACmd( Class *mixinPtr; FOREACH(mixinPtr, oPtr->mixins) { + if (!mixinPtr) { + continue; + } if (TclOOIsReachable(o2Ptr->classPtr, mixinPtr)) { result = 1; break; @@ -665,6 +671,9 @@ InfoObjectMixinsCmd( resultObj = Tcl_NewObj(); FOREACH(mixinPtr, oPtr->mixins) { + if (!mixinPtr) { + continue; + } Tcl_ListObjAppendElement(NULL, resultObj, TclOOObjectName(interp, mixinPtr->thisPtr)); } @@ -1281,6 +1290,9 @@ InfoClassMixinsCmd( resultObj = Tcl_NewObj(); FOREACH(mixinPtr, clsPtr->mixins) { + if (!mixinPtr) { + continue; + } Tcl_ListObjAppendElement(NULL, resultObj, TclOOObjectName(interp, mixinPtr->thisPtr)); } |