summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-03-06 19:58:45 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-03-06 19:58:45 (GMT)
commit160d8c5c26756b088beacbce9a1a684a4479dc64 (patch)
tree0b9e3ec2aeba94c9615a942c6986e5f160db31f8
parentd7a6d085200c6f5ac12f6f3b56ed0757001d7e98 (diff)
parent8806ae12c852e8ebb3e9e55ed0d0299d416fdf8a (diff)
downloadtcl-160d8c5c26756b088beacbce9a1a684a4479dc64.zip
tcl-160d8c5c26756b088beacbce9a1a684a4479dc64.tar.gz
tcl-160d8c5c26756b088beacbce9a1a684a4479dc64.tar.bz2
* generic/tclUtil.c (TclFindElement): Guard escape sequence scans
to not overrun the string end. [Bug 3192636]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclUtil.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aadf181..2680db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-06 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclUtil.c (TclFindElement): Guard escape sequence scans
+ to not overrun the string end. [Bug 3192636]
+
2011-03-05 Don Porter <dgp@users.sourceforge.net>
* generic/tclParse.c (TclParseBackslash): Correct trunction checks in
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index dcd2d5e..211a7cd 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -233,7 +233,7 @@ TclFindElement(
*/
case '\\':
- Tcl_UtfBackslash(p, &numChars, NULL);
+ TclParseBackslash(p, limit - p, &numChars, NULL);
p += (numChars - 1);
break;