summaryrefslogtreecommitdiffstats
path: root/generic/tclTrace.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-11-28 23:44:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-11-28 23:44:33 (GMT)
commit8b03ef0b29d52146cae3414edb12216bcc61feeb (patch)
tree39d60f75eb717fa93a1571cf2eec5cf397bf4699 /generic/tclTrace.c
parent8f6442b0c910bb7b7431c390a2dbb92985d83162 (diff)
parent71b0ad990caaf6a297049da2c63821a4e29c57ac (diff)
downloadtcl-8b03ef0b29d52146cae3414edb12216bcc61feeb.zip
tcl-8b03ef0b29d52146cae3414edb12216bcc61feeb.tar.gz
tcl-8b03ef0b29d52146cae3414edb12216bcc61feeb.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclTrace.c')
-rw-r--r--generic/tclTrace.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index ac92a73..daeb424 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -428,7 +428,7 @@ TraceExecutionObjCmd(
* pointer to its array of element pointers.
*/
- result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+ result = TclListObjLengthM(interp, objv[4], &listLen);
if (result != TCL_OK) {
return result;
}
@@ -440,6 +440,10 @@ TraceExecutionObjCmd(
NULL);
return TCL_ERROR;
}
+ result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+ if (result != TCL_OK) {
+ return result;
+ }
for (i = 0; i < listLen; i++) {
if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
"operation", TCL_EXACT, &index) != TCL_OK) {
@@ -670,7 +674,7 @@ TraceCommandObjCmd(
* pointer to its array of element pointers.
*/
- result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+ result = TclListObjLengthM(interp, objv[4], &listLen);
if (result != TCL_OK) {
return result;
}
@@ -682,7 +686,10 @@ TraceCommandObjCmd(
NULL);
return TCL_ERROR;
}
-
+ result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+ if (result != TCL_OK) {
+ return result;
+ }
for (i = 0; i < listLen; i++) {
if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
"operation", TCL_EXACT, &index) != TCL_OK) {
@@ -870,7 +877,7 @@ TraceVariableObjCmd(
* pointer to its array of element pointers.
*/
- result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+ result = TclListObjLengthM(interp, objv[4], &listLen);
if (result != TCL_OK) {
return result;
}
@@ -882,6 +889,10 @@ TraceVariableObjCmd(
NULL);
return TCL_ERROR;
}
+ result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+ if (result != TCL_OK) {
+ return result;
+ }
for (i = 0; i < listLen ; i++) {
if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
"operation", TCL_EXACT, &index) != TCL_OK) {