diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-12-23 03:11:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-12-23 03:11:01 (GMT) |
| commit | 1a92fb378c0e8060f433986fb0dc89bd04168a45 (patch) | |
| tree | a5328c9e7f0e9394621e84657c6454994d8084af /generic/tclExecute.c | |
| parent | 52bcb866e5ca12af686bac155a8922480f2b7117 (diff) | |
| parent | ef6f1ba2c34bd3243b54d46d23d37392d7bf34ba (diff) | |
| download | tcl-1a92fb378c0e8060f433986fb0dc89bd04168a45.zip tcl-1a92fb378c0e8060f433986fb0dc89bd04168a45.tar.gz tcl-1a92fb378c0e8060f433986fb0dc89bd04168a45.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 337a75f..b9da8fc 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -5410,8 +5410,8 @@ TEBCresume( s1 = (char *) Tcl_GetByteArrayFromObj(valuePtr, &s1len); s2 = (char *) Tcl_GetByteArrayFromObj(value2Ptr, &s2len); memCmpFn = memcmp; - } else if (((valuePtr->typePtr == &tclStringType) - && (value2Ptr->typePtr == &tclStringType))) { + } else if ((valuePtr->typePtr == &tclStringType) + && (value2Ptr->typePtr == &tclStringType)) { /* * Do a unicode-specific comparison if both of the args are of * String type. If the char length == byte length, we can do a @@ -5422,7 +5422,9 @@ TEBCresume( s1len = Tcl_GetCharLength(valuePtr); s2len = Tcl_GetCharLength(value2Ptr); if ((s1len == valuePtr->length) - && (s2len == value2Ptr->length)) { + && (valuePtr->bytes != NULL) + && (s2len == value2Ptr->length) + && (value2Ptr->bytes != NULL)) { s1 = valuePtr->bytes; s2 = value2Ptr->bytes; memCmpFn = memcmp; |