summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-03-06 20:07:14 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-03-06 20:07:14 (GMT)
commit2dfada7fc59b215a62fd6ab21b71e94bf0ec53bd (patch)
treef0a428406ea164a42bdf19c1be62238fab52fe75
parent3406a2aa517a55ad8bc5f5adc2896bf34e1bc745 (diff)
parent160d8c5c26756b088beacbce9a1a684a4479dc64 (diff)
downloadtcl-2dfada7fc59b215a62fd6ab21b71e94bf0ec53bd.zip
tcl-2dfada7fc59b215a62fd6ab21b71e94bf0ec53bd.tar.gz
tcl-2dfada7fc59b215a62fd6ab21b71e94bf0ec53bd.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 92bbde6..f297f9e 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 535634f..3fd6271 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -232,7 +232,7 @@ TclFindElement(
*/
case '\\':
- Tcl_UtfBackslash(p, &numChars, NULL);
+ TclParseBackslash(p, limit - p, &numChars, NULL);
p += (numChars - 1);
break;