From efc2aa388b3e16809efebb72d32b9b9ba17be69b Mon Sep 17 00:00:00 2001 From: hobbs Date: Tue, 10 Aug 2010 20:48:21 +0000 Subject: * generic/tclUtil.c (TclByteArrayMatch): patterns may not be null-terminated, so account for that. --- ChangeLog | 5 +++++ generic/tclUtil.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e67f9a..9acb6e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-10 Jeff Hobbs + + * generic/tclUtil.c (TclByteArrayMatch): patterns may not be + null-terminated, so account for that. + 2010-08-05 Don Porter *** 8.5.9 TAGGED FOR RELEASE *** diff --git a/generic/tclUtil.c b/generic/tclUtil.c index a2b4d84..64d36f4 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUtil.c,v 1.97.2.5 2008/08/22 18:00:15 dgp Exp $ + * RCS: @(#) $Id: tclUtil.c,v 1.97.2.6 2010/08/10 20:48:21 hobbs Exp $ */ #include "tclInt.h" @@ -1609,7 +1609,7 @@ TclByteArrayMatch( * Skip all successive *'s in the pattern. */ - while (*(++pattern) == '*') { + while ((++pattern < patternEnd) && (*pattern == '*')) { /* empty body */ } if (pattern == patternEnd) { -- cgit v0.12