summaryrefslogtreecommitdiffstats
path: root/generic/tclExecute.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-02-05 14:21:42 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-02-05 14:21:42 (GMT)
commitcd89b9ea6457cd428033dbb8b2f7746dd35222ed (patch)
tree596004a17d20a96f3f29775c6400a59cd9c7c043 /generic/tclExecute.c
parent7933720835766c9a797749bd47fd1501ae6871d2 (diff)
downloadtcl-cd89b9ea6457cd428033dbb8b2f7746dd35222ed.zip
tcl-cd89b9ea6457cd428033dbb8b2f7746dd35222ed.tar.gz
tcl-cd89b9ea6457cd428033dbb8b2f7746dd35222ed.tar.bz2
Fix [Bug 2568434]
Diffstat (limited to 'generic/tclExecute.c')
-rw-r--r--generic/tclExecute.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index d1c29eb..601fe6e 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -14,7 +14,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.424 2009/01/09 11:21:45 dkf Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.425 2009/02/05 14:21:42 dkf Exp $
*/
#include "tclInt.h"
@@ -2448,7 +2448,7 @@ TclExecuteByteCode(
opnd = TclGetUInt1AtPtr(pc+1);
/*
- * Detect only-bytearray-or-null case
+ * Detect only-bytearray-or-null case.
*/
for (currPtr=&OBJ_AT_DEPTH(opnd-1); currPtr<=&OBJ_AT_TOS; currPtr++) {
@@ -2456,6 +2456,10 @@ TclExecuteByteCode(
&& ((*currPtr)->bytes != tclEmptyStringRep)) {
onlyb = 0;
break;
+ } else if (((*currPtr)->typePtr == &tclByteArrayType) &&
+ ((*currPtr)->bytes != NULL)) {
+ onlyb = 0;
+ break;
}
}