[PATCH 1/2] Fix tokenizer for octal escape sequences

[PATCH 1/2] Fix tokenizer for octal escape sequences

[Namhyung Kim]

Don't allow 8 and 9 to be included in octal escape sequences.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 tokenize.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tokenize.c b/tokenize.c
index 4c975175eccc..272974b3b844 100644
--- a/tokenize.c
+++ b/tokenize.c
@@ -495,7 +495,7 @@ static int escapechar(int first, int type, stream_t *stream, int *valp)
 			case '0'...'7': {
 				int nr = 2;
 				value -= '0';
-				while (next >= '0' && next <= '9') {
+				while (next >= '0' && next <= '7') {
 					value = (value << 3) + (next-'0');
 					next = nextchar(stream);
 					if (!--nr)
-- 
1.7.3.3.400.g93cef

[PATCH 2/2] Update the validation check for escape sequences

[Namhyung Kim]

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 validation/escapes.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/validation/escapes.c b/validation/escapes.c
index b0d2b4b742c2..13f8f9c87e21 100644
--- a/validation/escapes.c
+++ b/validation/escapes.c
@@ -1,6 +1,21 @@
 static int e[] = { '\'', '\"', '\?', '\\',
-                   '\a', '\b', '\f', '\n', '\r', '\t', '\v', };
-static char *s = "\'\"\?\\ \a\b\f\n\r\t\v";
+                   '\a', '\b', '\f', '\n', '\r', '\t', '\v',
+		   '\0', '\012', '\x7890', '\xabcd' };
+static char *s = "\'\"\?\\ \a\b\f\n\r\t\v \377\xcafe";
+
+static int bad_e[] = { '\c', '\0123', '\789', '\xdefg' };
 /*
  * check-name: Character escape sequences
+ *
+ * check-error-start
+escapes.c:6:27: warning: Unknown escape 'c'
+escapes.c:6:35: error: Bad character constant
+escapes.c:6:38: error: Bad character constant
+escapes.c:6:42: error: Bad character constant
+escapes.c:6:46: error: Bad character constant
+escapes.c:6:53: error: Bad character constant
+escapes.c:6:56: error: Bad character constant
+escapes.c:6:42: error: Expected } at end of initializer
+escapes.c:6:42: error: got 89
+ * check-error-end
  */
-- 
1.7.3.3.400.g93cef

Re: [PATCH 1/2] Fix tokenizer for octal escape sequences

[Christopher Li]

On Thu, Dec 16, 2010 at 1:14 AM, Namhyung Kim <namhyung@gmail.com> wrote:
> Don't allow 8 and 9 to be included in octal escape sequences.
> -                               while (next >= '0' && next <= '9') {
> +                               while (next >= '0' && next <= '7') {

Wow, good catch.

Thanks

Chris
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html