From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 16 May 2018 09:13:19 +0000 (+0200)
Subject: scanner: Accept backreferences \1 through \99 in regex literals
X-Git-Tag: 0.38.10~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f93f36a0c2c8f28f14085d18055b67aba9b0493;p=thirdparty%2Fvala.git

scanner: Accept backreferences \1 through \99 in regex literals

https://bugzilla.gnome.org/show_bug.cgi?id=728574
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f9dfaffd0..7b886882a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -355,6 +355,7 @@ TESTS = \
 	parser/preprocessor.vala \
 	parser/template.vala \
 	parser/tuple.vala \
+	parser/bug728574.vala \
 	parser/bug749576.vala \
 	$(NULL)
 
diff --git a/tests/parser/bug728574.vala b/tests/parser/bug728574.vala
new file mode 100644
index 000000000..01fe54584
--- /dev/null
+++ b/tests/parser/bug728574.vala
@@ -0,0 +1,3 @@
+void main () {
+	var r = /^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/;
+}
diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala
index 4afb9f28d..91d45b2f5 100644
--- a/vala/valageniescanner.vala
+++ b/vala/valageniescanner.vala
@@ -240,7 +240,17 @@ public class Vala.Genie.Scanner {
 							}
 							break;
 						default:
-							Report.error (get_source_reference (token_length_in_chars), "invalid escape sequence");
+							// back references \1 through \99
+							if (current[0].isdigit ()) {
+								current++;
+								token_length_in_chars++;
+								if (current[0].isdigit ()) {
+									current++;
+									token_length_in_chars++;
+								}
+							} else {
+								Report.error (get_source_reference (token_length_in_chars), "invalid escape sequence");
+							}
 							break;
 						}
 					} else if (current[0] == '\n') {
diff --git a/vala/valascanner.vala b/vala/valascanner.vala
index 7c4c75c0c..063b261be 100644
--- a/vala/valascanner.vala
+++ b/vala/valascanner.vala
@@ -242,7 +242,17 @@ public class Vala.Scanner {
 							}
 							break;
 						default:
-							Report.error (get_source_reference (token_length_in_chars), "invalid escape sequence");
+							// back references \1 through \99
+							if (current[0].isdigit ()) {
+								current++;
+								token_length_in_chars++;
+								if (current[0].isdigit ()) {
+									current++;
+									token_length_in_chars++;
+								}
+							} else {
+								Report.error (get_source_reference (token_length_in_chars), "invalid escape sequence");
+							}
 							break;
 						}
 					} else if (current[0] == '\n') {