diff options
| author | hobbs <hobbs> | 2007-11-09 18:55:13 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2007-11-09 18:55:13 (GMT) |
| commit | 2ebefee1b05df6c41125e6bc8ed768c0cc4f50dc (patch) | |
| tree | 2279f9c57d51ffd67adb4ac91577b40b49ecd3ad /generic/tclExecute.c | |
| parent | 51c3524facba45f2ebda897b58b073fb0e932024 (diff) | |
| download | tcl-2ebefee1b05df6c41125e6bc8ed768c0cc4f50dc.zip tcl-2ebefee1b05df6c41125e6bc8ed768c0cc4f50dc.tar.gz tcl-2ebefee1b05df6c41125e6bc8ed768c0cc4f50dc.tar.bz2 | |
* generic/tclInt.decls, generic/tclIntDecls.h: Use unsigned char for
* generic/tclExecute.c, generic/tclUtil.c: TclByteArrayMatch
and don't allow a nocase option. [Bug 1828296]
For INST_STR_MATCH, ignore pattern type for TclByteArrayMatch case.
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 6f65c2a..6971a0a 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclExecute.c,v 1.341 2007/11/08 07:10:43 das Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.342 2007/11/09 18:55:14 hobbs Exp $ */ #include "tclInt.h" @@ -4063,15 +4063,13 @@ TclExecuteByteCode( ustring2 = Tcl_GetUnicodeFromObj(value2Ptr, &length2); match = TclUniCharMatch(ustring1, length1, ustring2, length2, nocase); - } else if ((valuePtr->typePtr == &tclByteArrayType) - || (value2Ptr->typePtr == &tclByteArrayType)) { + } else if ((valuePtr->typePtr == &tclByteArrayType) && !nocase) { unsigned char *string1, *string2; int length1, length2; string1 = Tcl_GetByteArrayFromObj(valuePtr, &length1); string2 = Tcl_GetByteArrayFromObj(value2Ptr, &length2); - match = TclByteArrayMatch((char*) string1, length1, - (char*) string2, length2, nocase); + match = TclByteArrayMatch(string1, length1, string2, length2); } else { match = Tcl_StringCaseMatch(TclGetString(valuePtr), TclGetString(value2Ptr), nocase); |