diff options
| -rw-r--r-- | generic/tclExecute.c | 40 | ||||
| -rw-r--r-- | generic/tclInterp.c | 1 |
2 files changed, 36 insertions, 5 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 2e03ab4..acb6bf1 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -80,10 +80,40 @@ int tclTraceExec = 0; */ static const char *const operatorStrings[] = { - "||", "&&", "|", "^", "&", "==", "!=", "<", ">", "<=", ">=", "<<", ">>", - "+", "-", "*", "/", "%", "+", "-", "~", "!", - "BUILTIN FUNCTION", "FUNCTION", - "", "", "", "", "", "", "", "", "eq", "ne" + "||", /* 0 */ + "&&", /* 1 */ + "|", /* 2 */ + "^", /* 3 */ + "&", /* 4 */ + "==", /* 5 */ + "!=", /* 6 */ + "<", /* 7 */ + ">", /* 8 */ + "<=", /* 9 */ + ">=", /* 10 */ + "<<", /* 11 */ + ">>", /* 12 */ + "+", /* 13 */ + "-", /* 14 */ + "*", /* 15 */ + "/", /* 16 */ + "%", /* 17 */ + "+", /* 18 */ + "-", /* 19 */ + "~", /* 20 */ + "!", /* 21 */ + "BUILTIN FUNCTION", /* 22 */ + "FUNCTION", /* 23 */ + "", /* 24 */ + "", /* 25 */ + "", /* 26 */ + "", /* 27 */ + "", /* 28 */ + "", /* 29 */ + "", /* 30 */ + "", /* 31 */ + "eq", /* 32 */ + "ne" /* 33 */ }; /* @@ -9831,7 +9861,7 @@ IllegalExprOperandType( if (opcode == INST_EXPON) { operator = "**"; } else if (opcode <= INST_STR_NEQ) { - operator = operatorStrings[opcode - INST_LOR]; + operator = operatorStrings[opcode - INST_LOR -1]; } if (GetNumberFromObj(NULL, opndPtr, &ptr, &type) != TCL_OK) { diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 0da5d47..bc8738b 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -3584,6 +3584,7 @@ Tcl_LimitAddHandler( return; } + ckfree(handlerPtr); /* pacify coverity CID 487047 */ Tcl_Panic("unknown type of resource limit"); } |