commit 5c15caef8a393faf8343b63d9f01de4246740805
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon Nov 25 09:35:53 2019 +0100
scanner: "\x" requires two hex digits at most and ignore leading zero #2
vala/valageniescanner.vala | 33 ++++++++++++++++++++++++---------
vala/valascanner.vala | 29 ++++++++++++++++++++++-------
2 files changed, 46 insertions(+), 16 deletions(-)
---
diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala
index 26d34aff7..e6a1631fd 100644
--- 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 e824fd618..cb65528a6 100644
--- a/vala/valascanner.vala
+++ b/vala/valascanner.vala
@@ -233,12 +233,17 @@ public class Vala.Scanner {
current++;
token_length_in_chars++;
int digit_length;
- for (digit_length = 0; 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) {
- Report.error (get_source_reference
(token_length_in_chars), "\\x requires at least one hex digit");
+ 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 +750,17 @@ public class Vala.Scanner {
current++;
token_length_in_chars++;
int digit_length;
- for (digit_length = 0; 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:
@@ -1180,12 +1190,17 @@ public class Vala.Scanner {
current++;
token_length_in_chars++;
int digit_length;
- for (digit_length = 0; 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) {
- Report.error (get_source_reference
(token_length_in_chars), "\\x requires at least one hex digit");
+ 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: