scanner: "\x" requires two hex digits at most and ignore leading zero #2

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a18e333c12a38463f208e960c16ce81b8c7e6e79..1bc7c42061aed27f1686467104014175406eecaf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -571,6 +571,7 @@ TESTS = \
        scanner/regex-escape-invalid.test \
        scanner/regex-escape-u-digit-length.test \
        scanner/regex-escape-x-digit-length.test \
+       scanner/regex-escape-x-empty.test \
        scanner/regex-escape-x.vala \
        scanner/regex-multiple-i.test \
        scanner/regex-multiple-m.test \
@@ -578,6 +579,7 @@ TESTS = \
        scanner/regex-multiple-x.test \
        scanner/string-escape-u-digit-length.test \
        scanner/string-escape-x-digit-length.test \
+       scanner/string-escape-x-empty.test \
        scanner/string-escape-x.vala \
        parser/assignment.vala \
        parser/attribute-duplicate.test \

diff --git a/tests/scanner/regex-escape-x-digit-length.test b/tests/scanner/regex-escape-x-digit-length.test
index 4c88c55ca09ec10bb7b406aa252ae8da5c6624c1..693415201f2165424a523ce19ba5b0a8cdd7aa85 100644 (file)
--- a/tests/scanner/regex-escape-x-digit-length.test
+++ b/tests/scanner/regex-escape-x-digit-length.test
@@ -1,5 +1,5 @@
 Invalid Code
 
 void main () {
-       Regex foo = /\x/s;
+       Regex foo = /\xaaa/s;
 }

diff --git a/tests/scanner/regex-escape-x-empty.test b/tests/scanner/regex-escape-x-empty.test
new file mode 100644 (file)
index 0000000..4c88c55
--- /dev/null
+++ b/tests/scanner/regex-escape-x-empty.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       Regex foo = /\x/s;
+}

diff --git a/tests/scanner/regex-escape-x.vala b/tests/scanner/regex-escape-x.vala
index ebd59b16e994ddea8d5858851e4fb5f5ba55189f..ee226c7ddef51828a50ab0d4c365293e16c37334 100644 (file)
--- a/tests/scanner/regex-escape-x.vala
+++ b/tests/scanner/regex-escape-x.vala
@@ -1,3 +1,3 @@
 void main () {
-       Regex foo = /\x10/s;
+       Regex foo = /\x10\x00\x00aa/s;
 }

diff --git a/tests/scanner/string-escape-x-digit-length.test b/tests/scanner/string-escape-x-digit-length.test
index f2134491be24c59e0d2fc8e4104e10a141992c12..89be3d98e61813b5a3ec81fefbefa419d96a8a3f 100644 (file)
--- a/tests/scanner/string-escape-x-digit-length.test
+++ b/tests/scanner/string-escape-x-digit-length.test
@@ -1,5 +1,5 @@
 Invalid Code
 
 void main () {
-       string foo = "\x";
+       string foo = "\xaaa";
 }

diff --git a/tests/scanner/string-escape-x-empty.test b/tests/scanner/string-escape-x-empty.test
new file mode 100644 (file)
index 0000000..f213449
--- /dev/null
+++ b/tests/scanner/string-escape-x-empty.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       string foo = "\x";
+}

diff --git a/tests/scanner/string-escape-x.vala b/tests/scanner/string-escape-x.vala
index 090c309988a5bc56e0f9e6a7ebc519d04a2c1f69..316cbf82442cb715613e268828701fdc6d17de99 100644 (file)
--- a/tests/scanner/string-escape-x.vala
+++ b/tests/scanner/string-escape-x.vala
@@ -1,3 +1,3 @@
 void main () {
-       string foo = "\x10";
+       string foo = "\x10\x00\x00aa";
 }

diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala
index 26d34aff7ad55aa5e31eef5aed5103cf6cb09916..e6a1631fdfb31326247aded1e07851be9e44fce5 100644 (file)
--- a/vala/valageniescanner.vala
+++ b/vala/valageniescanner.vala
@@ -248,12 +248,17 @@ public class Vala.Genie.Scanner {
                                                        current++;
                                                        token_length_in_chars++;
                                                        int digit_length;
-                                                       for (digit_length = 0; digit_length < 2 && current < end && current[0].isxdigit (); digit_length++) {
+                                                       for (digit_length = 0; current < end && current[0].isxdigit ();) {
+                                                               if (current[0] != '0') {
+                                                                       digit_length++;
+                                                               }
                                                                current++;
                                                                token_length_in_chars++;
                                                        }
-                                                       if (digit_length != 2) {
-                                                               Report.error (get_source_reference (token_length_in_chars), "\\x requires two hex digits");
+                                                       if (digit_length < 1) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "\\x used with no following hex digits");
+                                                       } else if (digit_length > 2) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "hex escape sequence out of range");
                                                        }
                                                        break;
                                                default:
@@ -771,12 +776,17 @@ public class Vala.Genie.Scanner {
                                                        current++;
                                                        token_length_in_chars++;
                                                        int digit_length;
-                                                       for (digit_length = 0; digit_length < 2 && current < end && current[0].isxdigit (); digit_length++) {
+                                                       for (digit_length = 0; current < end && current[0].isxdigit ();) {
+                                                               if (current[0] != '0') {
+                                                                       digit_length++;
+                                                               }
                                                                current++;
                                                                token_length_in_chars++;
                                                        }
-                                                       if (digit_length < 1 || digit_length > 2) {
-                                                               Report.error (get_source_reference (token_length_in_chars), "\\x requires at least one or two hex digit");
+                                                       if (digit_length < 1) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "\\x used with no following hex digits");
+                                                       } else if (digit_length > 2) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "hex escape sequence out of range");
                                                        }
                                                        break;
                                                default:
@@ -1344,12 +1354,17 @@ public class Vala.Genie.Scanner {
                                                        current++;
                                                        token_length_in_chars++;
                                                        int digit_length;
-                                                       for (digit_length = 0; digit_length < 2 && current < end && current[0].isxdigit (); digit_length++) {
+                                                       for (digit_length = 0; current < end && current[0].isxdigit ();) {
+                                                               if (current[0] != '0') {
+                                                                       digit_length++;
+                                                               }
                                                                current++;
                                                                token_length_in_chars++;
                                                        }
-                                                       if (digit_length != 2) {
-                                                               Report.error (get_source_reference (token_length_in_chars), "\\x requires two hex digits");
+                                                       if (digit_length < 1) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "\\x used with no following hex digits");
+                                                       } else if (digit_length > 2) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "hex escape sequence out of range");
                                                        }
                                                        break;
                                                default:

diff --git a/vala/valascanner.vala b/vala/valascanner.vala
index e824fd618c911b50a25434d8c7946011d6d03c68..9153c4bc48458403ef5d7106caf0d9b3ce626b13 100644 (file)
--- a/vala/valascanner.vala
+++ b/vala/valascanner.vala
@@ -233,12 +233,20 @@ public class Vala.Scanner {
                                                        current++;
                                                        token_length_in_chars++;
                                                        int digit_length;
-                                                       for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) {
+                                                       bool empty = true;
+                                                       for (digit_length = 0; current < end && current[0].isxdigit ();) {
+                                                               if (current[0] != '0') {
+                                                                       digit_length++;
+                                                               } else {
+                                                                       empty = false;
+                                                               }
                                                                current++;
                                                                token_length_in_chars++;
                                                        }
-                                                       if (digit_length < 1) {
-                                                               Report.error (get_source_reference (token_length_in_chars), "\\x requires at least one hex digit");
+                                                       if (empty && digit_length < 1) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "\\x used with no following hex digits");
+                                                       } else if (digit_length > 2) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "hex escape sequence out of range");
                                                        }
                                                        break;
                                                default:
@@ -745,12 +753,20 @@ public class Vala.Scanner {
                                                        current++;
                                                        token_length_in_chars++;
                                                        int digit_length;
-                                                       for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) {
+                                                       bool empty = true;
+                                                       for (digit_length = 0; current < end && current[0].isxdigit ();) {
+                                                               if (current[0] != '0') {
+                                                                       digit_length++;
+                                                               } else {
+                                                                       empty = false;
+                                                               }
                                                                current++;
                                                                token_length_in_chars++;
                                                        }
-                                                       if (digit_length < 1 || digit_length > 2) {
-                                                               Report.error (get_source_reference (token_length_in_chars), "\\x requires at least one or two hex digit");
+                                                       if (empty && digit_length < 1) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "\\x used with no following hex digits");
+                                                       } else if (digit_length > 2) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "hex escape sequence out of range");
                                                        }
                                                        break;
                                                default:
@@ -1180,12 +1196,20 @@ public class Vala.Scanner {
                                                        current++;
                                                        token_length_in_chars++;
                                                        int digit_length;
-                                                       for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) {
+                                                       bool empty = true;
+                                                       for (digit_length = 0; current < end && current[0].isxdigit ();) {
+                                                               if (current[0] != '0') {
+                                                                       digit_length++;
+                                                               } else {
+                                                                       empty = false;
+                                                               }
                                                                current++;
                                                                token_length_in_chars++;
                                                        }
-                                                       if (digit_length < 1) {
-                                                               Report.error (get_source_reference (token_length_in_chars), "\\x requires at least one hex digit");
+                                                       if (empty && digit_length < 1) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "\\x used with no following hex digits");
+                                                       } else if (digit_length > 2) {
+                                                               Report.error (get_source_reference (token_length_in_chars), "hex escape sequence out of range");
                                                        }
                                                        break;
                                                default: