summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-08-22 18:00:58 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-08-22 18:00:58 (GMT)
commitc531d0f4476d9cbe08053202cb8ba541451b99bf (patch)
treea64987b1bd708492da130e7cf574ffa1e4f94d9a /generic
parent6f75579e3a357853eaa316f593edcb47eddc0c36 (diff)
downloadtcl-c531d0f4476d9cbe08053202cb8ba541451b99bf.zip
tcl-c531d0f4476d9cbe08053202cb8ba541451b99bf.tar.gz
tcl-c531d0f4476d9cbe08053202cb8ba541451b99bf.tar.bz2
* generic/tclUtil.c (TclReToGlob): Added missing set of the
*exactPtr value to really fix [Bug 2065115]. Also avoid possible DString overflow.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclUtil.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 6f74ad8..22b9e73 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.102 2008/08/22 17:26:46 dgp Exp $
+ * RCS: @(#) $Id: tclUtil.c,v 1.103 2008/08/22 18:01:00 dgp Exp $
*/
#include "tclInt.h"
@@ -3275,18 +3275,16 @@ TclReToGlob(
Tcl_DStringInit(dsPtr);
/*
- * Write to the ds directly without the function overhead.
- * An equivalent glob pattern can be no more than reStrLen+2 in size.
- */
-
- Tcl_DStringSetLength(dsPtr, reStrLen + 2);
- dsStr = dsStrStart = Tcl_DStringValue(dsPtr);
-
- /*
* "***=xxx" == "*xxx*", watch for glob-sensitive chars.
*/
if ((reStrLen >= 4) && (memcmp("***=", reStr, 4) == 0)) {
+ /*
+ * At most, the glob pattern has length 2*reStrLen + 2 to
+ * backslash escape every character and have * at each end.
+ */
+ Tcl_DStringSetLength(dsPtr, reStrLen + 2);
+ dsStr = dsStrStart = Tcl_DStringValue(dsPtr);
*dsStr++ = '*';
for (p = reStr + 4; p < strEnd; p++) {
switch (*p) {
@@ -3308,6 +3306,14 @@ TclReToGlob(
}
/*
+ * At most, the glob pattern has length reStrLen + 2 to account
+ * for possible * at each end.
+ */
+
+ Tcl_DStringSetLength(dsPtr, reStrLen + 2);
+ dsStr = dsStrStart = Tcl_DStringValue(dsPtr);
+
+ /*
* Check for anchored REs (ie ^foo$), so we can use string equal if
* possible. Do not alter the start of str so we can free it correctly.
*