diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-11-25 22:04:33 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-11-25 22:45:20 +0100 |
| commit | 77fe44c8a4064a77f93ec79cd380a31a1d565b6f (patch) | |
| tree | 68a99fcc0d23cc875823a347767aa7f2beed4761 /vala | |
| parent | 88aa22af923e2cb452696d2f17822d4b88c70b79 (diff) | |
| download | vala-77fe44c8a4064a77f93ec79cd380a31a1d565b6f.tar.gz | |
scanner: Improve check of "\u" escape sequence
Diffstat (limited to 'vala')
| -rw-r--r-- | vala/valageniescanner.vala | 24 | ||||
| -rw-r--r-- | vala/valascanner.vala | 24 |
2 files changed, 30 insertions, 18 deletions
diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala index e6a1631fd..b5ff25f6a 100644 --- a/vala/valageniescanner.vala +++ b/vala/valageniescanner.vala @@ -235,12 +235,14 @@ public class Vala.Genie.Scanner { current++; token_length_in_chars++; int digit_length; - for (digit_length = 0; digit_length < 4 && current < end && current[0].isxdigit (); digit_length++) { + for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) { current++; token_length_in_chars++; } - if (digit_length != 4) { - Report.error (get_source_reference (token_length_in_chars), "\\u requires four hex digits"); + if (digit_length < 1) { + Report.error (get_source_reference (token_length_in_chars), "\\u used with no following hex digits"); + } else if (digit_length < 4) { + Report.error (get_source_reference (token_length_in_chars), "incomplete universal character name"); } break; case 'x': @@ -763,12 +765,14 @@ public class Vala.Genie.Scanner { current++; token_length_in_chars++; int digit_length; - for (digit_length = 0; digit_length < 4 && current < end && current[0].isxdigit (); digit_length++) { + for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) { current++; token_length_in_chars++; } - if (digit_length != 4) { - Report.error (get_source_reference (token_length_in_chars), "\\u requires four hex digits"); + if (digit_length < 1) { + Report.error (get_source_reference (token_length_in_chars), "\\u used with no following hex digits"); + } else if (digit_length < 4) { + Report.error (get_source_reference (token_length_in_chars), "incomplete universal character name"); } break; case 'x': @@ -1341,12 +1345,14 @@ public class Vala.Genie.Scanner { current++; token_length_in_chars++; int digit_length; - for (digit_length = 0; digit_length < 4 && current < end && current[0].isxdigit (); digit_length++) { + for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) { current++; token_length_in_chars++; } - if (digit_length != 4) { - Report.error (get_source_reference (token_length_in_chars), "\\u requires four hex digits"); + if (digit_length < 1) { + Report.error (get_source_reference (token_length_in_chars), "\\u used with no following hex digits"); + } else if (digit_length < 4) { + Report.error (get_source_reference (token_length_in_chars), "incomplete universal character name"); } break; case 'x': diff --git a/vala/valascanner.vala b/vala/valascanner.vala index 9153c4bc4..a2e76b4d5 100644 --- a/vala/valascanner.vala +++ b/vala/valascanner.vala @@ -220,12 +220,14 @@ public class Vala.Scanner { current++; token_length_in_chars++; int digit_length; - for (digit_length = 0; digit_length < 4 && current < end && current[0].isxdigit (); digit_length++) { + for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) { current++; token_length_in_chars++; } - if (digit_length != 4) { - Report.error (get_source_reference (token_length_in_chars), "\\u requires four hex digits"); + if (digit_length < 1) { + Report.error (get_source_reference (token_length_in_chars), "\\u used with no following hex digits"); + } else if (digit_length < 4) { + Report.error (get_source_reference (token_length_in_chars), "incomplete universal character name"); } break; case 'x': @@ -740,12 +742,14 @@ public class Vala.Scanner { current++; token_length_in_chars++; int digit_length; - for (digit_length = 0; digit_length < 4 && current < end && current[0].isxdigit (); digit_length++) { + for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) { current++; token_length_in_chars++; } - if (digit_length != 4) { - Report.error (get_source_reference (token_length_in_chars), "\\u requires four hex digits"); + if (digit_length < 1) { + Report.error (get_source_reference (token_length_in_chars), "\\u used with no following hex digits"); + } else if (digit_length < 4) { + Report.error (get_source_reference (token_length_in_chars), "incomplete universal character name"); } break; case 'x': @@ -1183,12 +1187,14 @@ public class Vala.Scanner { current++; token_length_in_chars++; int digit_length; - for (digit_length = 0; digit_length < 4 && current < end && current[0].isxdigit (); digit_length++) { + for (digit_length = 0; current < end && current[0].isxdigit (); digit_length++) { current++; token_length_in_chars++; } - if (digit_length != 4) { - Report.error (get_source_reference (token_length_in_chars), "\\u requires four hex digits"); + if (digit_length < 1) { + Report.error (get_source_reference (token_length_in_chars), "\\u used with no following hex digits"); + } else if (digit_length < 4) { + Report.error (get_source_reference (token_length_in_chars), "incomplete universal character name"); } break; case 'x': |