From 6f4c6b438f678ccc6e493a7844b48f3464dac417 Mon Sep 17 00:00:00 2001 From: dgp Date: Sun, 6 Mar 2011 04:36:19 +0000 Subject: * generic/tclParse.c (TclParseBackslash): Correct trunction checks in * tests/parse.test: \x and \u substitutions. [Bug 3200987] --- ChangeLog | 5 +++++ generic/tclParse.c | 4 ++-- tests/parse.test | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe46847..d8ab407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-05 Don Porter + + * generic/tclParse.c (TclParseBackslash): Correct trunction checks in + * tests/parse.test: \x and \u substitutions. [Bug 3200987] + 2011-01-25 Jan Nijtmans * generic/tclCkalloc.c: [Bug 3129448]: Possible over-allocation on 64-bit diff --git a/generic/tclParse.c b/generic/tclParse.c index ec9dc09..a3f8433 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -616,7 +616,7 @@ TclParseBackslash(src, numBytes, readPtr, dst) result = 0xb; break; case 'x': - count += TclParseHex(p+1, numBytes-1, &result); + count += TclParseHex(p+1, numBytes-2, &result); if (count == 2) { /* No hexadigits -> This is just "x". */ result = 'x'; @@ -626,7 +626,7 @@ TclParseBackslash(src, numBytes, readPtr, dst) } break; case 'u': - count += TclParseHex(p+1, (numBytes > 5) ? 4 : numBytes-1, &result); + count += TclParseHex(p+1, (numBytes > 5) ? 4 : numBytes-2, &result); if (count == 2) { /* No hexadigits -> This is just "u". */ result = 'u'; diff --git a/tests/parse.test b/tests/parse.test index fa50679..3118cf8 100644 --- a/tests/parse.test +++ b/tests/parse.test @@ -844,6 +844,44 @@ test parse-19.4 {Bug 1115904: recursion limit in Tcl_EvalEx} -setup { interp delete i } -returnCodes error -match glob -result {too many nested*} +test parse-20.1 {TclParseBackslash: truncated escape} { + testparser {\u12345} 1 +} {- \\ 1 simple \\ 1 text \\ 0 u12345} +test parse-20.2 {TclParseBackslash: truncated escape} { + testparser {\u12345} 2 +} {- {\u} 1 word {\u} 1 backslash {\u} 0 12345} +test parse-20.3 {TclParseBackslash: truncated escape} { + testparser {\u12345} 3 +} {- {\u1} 1 word {\u1} 1 backslash {\u1} 0 2345} +test parse-20.4 {TclParseBackslash: truncated escape} { + testparser {\u12345} 4 +} {- {\u12} 1 word {\u12} 1 backslash {\u12} 0 345} +test parse-20.5 {TclParseBackslash: truncated escape} { + testparser {\u12345} 5 +} {- {\u123} 1 word {\u123} 1 backslash {\u123} 0 45} +test parse-20.6 {TclParseBackslash: truncated escape} { + testparser {\u12345} 6 +} {- {\u1234} 1 word {\u1234} 1 backslash {\u1234} 0 5} +test parse-20.7 {TclParseBackslash: truncated escape} { + testparser {\u12345} 7 +} {- {\u12345} 1 word {\u12345} 2 backslash {\u1234} 0 text 5 0 {}} + +test parse-20.8 {TclParseBackslash: truncated escape} { + testparser {\x12X} 1 +} {- \\ 1 simple \\ 1 text \\ 0 x12X} +test parse-20.9 {TclParseBackslash: truncated escape} { + testparser {\x12X} 2 +} {- {\x} 1 word {\x} 1 backslash {\x} 0 12X} +test parse-20.10 {TclParseBackslash: truncated escape} { + testparser {\x12X} 3 +} {- {\x1} 1 word {\x1} 1 backslash {\x1} 0 2X} +test parse-20.11 {TclParseBackslash: truncated escape} { + testparser {\x12X} 4 +} {- {\x12} 1 word {\x12} 1 backslash {\x12} 0 X} +test parse-20.12 {TclParseBackslash: truncated escape} { + testparser {\x12X} 5 +} {- {\x12X} 1 word {\x12X} 2 backslash {\x12} 0 text X 0 {}} + # cleanup catch {unset a} ::tcltest::cleanupTests -- cgit v0.12