Skip to content

Commit d225404

Browse files
danmoseleydanmoseley
authored
Fix crash in fixer on certain invalid patterns (#80007)
1 parent a224371 commit d225404

18 files changed

+300
-227
lines changed

‎src/libraries/System.Text.RegularExpressions/gen/Resources/Strings.resx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
154154
</data>
155155
<data name="ShorthandClassInCharacterRange" xml:space="preserve">
156-
<value>Cannot include class \\{0} in character range.</value>
156+
<value>Cannot include class \{0} in character range.</value>
157157
</data>
158158
<data name="BeginIndexNotNegative" xml:space="preserve">
159159
<value>Start index cannot be less than 0 or greater than input length.</value>
@@ -178,13 +178,13 @@
178178
<value>AppDomain data '{0}' contains the invalid value or object '{1}' for specifying a default matching timeout for System.Text.RegularExpressions.Regex.</value>
179179
</data>
180180
<data name="UnescapedEndingBackslash" xml:space="preserve">
181-
<value>Illegal \\ at end of pattern.</value>
181+
<value>Illegal \ at end of pattern.</value>
182182
</data>
183183
<data name="ReversedQuantifierRange" xml:space="preserve">
184184
<value>Illegal {x,y} with x &gt; y.</value>
185185
</data>
186186
<data name="InvalidUnicodePropertyEscape" xml:space="preserve">
187-
<value>Incomplete \\p{X} character escape.</value>
187+
<value>Incomplete \p{X} character escape.</value>
188188
</data>
189189
<data name="CaptureGroupNameInvalid" xml:space="preserve">
190190
<value>Invalid group name: Group names must begin with a word character.</value>
@@ -193,13 +193,13 @@
193193
<value>Length cannot be less than 0 or exceed input length.</value>
194194
</data>
195195
<data name="MalformedNamedReference" xml:space="preserve">
196-
<value>Malformed \\k&lt;...&gt; named back reference.</value>
196+
<value>Malformed \k&lt;...&gt; named back reference.</value>
197197
</data>
198198
<data name="AlternationHasMalformedReference" xml:space="preserve">
199199
<value>Conditional alternation is missing a closing parenthesis after the group number {0}.</value>
200200
</data>
201201
<data name="MalformedUnicodePropertyEscape" xml:space="preserve">
202-
<value>Malformed \\p{X} character escape.</value>
202+
<value>Malformed \p{X} character escape.</value>
203203
</data>
204204
<data name="MakeException" xml:space="preserve">
205205
<value>Invalid pattern '{0}' at offset {1}. {2}</value>
@@ -226,7 +226,7 @@
226226
<value>Quantifier '{0}' following nothing.</value>
227227
</data>
228228
<data name="RegexMatchTimeoutException_Occurred" xml:space="preserve">
229-
<value>The RegEx engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</value>
229+
<value>The Regex engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</value>
230230
</data>
231231
<data name="ReversedCharacterRange" xml:space="preserve">
232232
<value>[x-y] range in reverse order.</value>
@@ -235,7 +235,7 @@
235235
<value>A subtraction must be the last element in a character class.</value>
236236
</data>
237237
<data name="InsufficientOrInvalidHexDigits" xml:space="preserve">
238-
<value>Insufficient hexadecimal digits.</value>
238+
<value>Insufficient or invalid hexadecimal digits.</value>
239239
</data>
240240
<data name="AlternationHasTooManyConditions" xml:space="preserve">
241241
<value>Too many | in (?()|).</value>
@@ -259,7 +259,7 @@
259259
<value>Unrecognized control character.</value>
260260
</data>
261261
<data name="UnrecognizedEscape" xml:space="preserve">
262-
<value>Unrecognized escape sequence \\{0}.</value>
262+
<value>Unrecognized escape sequence \{0}.</value>
263263
</data>
264264
<data name="InvalidGroupingConstruct" xml:space="preserve">
265265
<value>Unrecognized grouping construct.</value>

‎src/libraries/System.Text.RegularExpressions/gen/Resources/xlf/Strings.cs.xlf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<note />
8989
</trans-unit>
9090
<trans-unit id="InsufficientOrInvalidHexDigits">
91-
<source>Insufficient hexadecimal digits.</source>
92-
<target state="translated">Nedostatek šestnáctkových číslic.</target>
91+
<source>Insufficient or invalid hexadecimal digits.</source>
92+
<target state="needs-review-translation">Nedostatek šestnáctkových číslic.</target>
9393
<note />
9494
</trans-unit>
9595
<trans-unit id="InvalidGroupingConstruct">
@@ -113,8 +113,8 @@
113113
<note>{Locked="GeneratedRegexAttribute"}</note>
114114
</trans-unit>
115115
<trans-unit id="InvalidUnicodePropertyEscape">
116-
<source>Incomplete \\p{X} character escape.</source>
117-
<target state="translated">Neúplné uvození znaků \\p{X}.</target>
116+
<source>Incomplete \p{X} character escape.</source>
117+
<target state="needs-review-translation">Neúplné uvození znaků \\p{X}.</target>
118118
<note />
119119
</trans-unit>
120120
<trans-unit id="LengthNotNegative">
@@ -138,13 +138,13 @@
138138
<note />
139139
</trans-unit>
140140
<trans-unit id="MalformedNamedReference">
141-
<source>Malformed \\k&lt;...&gt; named back reference.</source>
142-
<target state="translated">Chybně naformátovaný pojmenovaný zpětný odkaz \\k&lt;...&gt;.</target>
141+
<source>Malformed \k&lt;...&gt; named back reference.</source>
142+
<target state="needs-review-translation">Chybně naformátovaný pojmenovaný zpětný odkaz \\k&lt;...&gt;.</target>
143143
<note />
144144
</trans-unit>
145145
<trans-unit id="MalformedUnicodePropertyEscape">
146-
<source>Malformed \\p{X} character escape.</source>
147-
<target state="translated">Chybně formátovaná řídicí sekvence znaků \\p{X}.</target>
146+
<source>Malformed \p{X} character escape.</source>
147+
<target state="needs-review-translation">Chybně formátovaná řídicí sekvence znaků \\p{X}.</target>
148148
<note />
149149
</trans-unit>
150150
<trans-unit id="MissingControlCharacter">
@@ -193,8 +193,8 @@
193193
<note>{Locked="Int32.MaxValue"}</note>
194194
</trans-unit>
195195
<trans-unit id="RegexMatchTimeoutException_Occurred">
196-
<source>The RegEx engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</source>
197-
<target state="translated">Vypršel časový limit modulu RegEx při pokusu o porovnání vzoru se vstupním řetězcem. K tomu může dojít z celé řady důvodů, mezi které patří velká velikost vstupních dat nebo nadměrné zpětné navracení způsobené vloženými kvantifikátory, zpětnými odkazy a dalšími faktory.</target>
196+
<source>The Regex engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</source>
197+
<target state="needs-review-translation">Vypršel časový limit modulu RegEx při pokusu o porovnání vzoru se vstupním řetězcem. K tomu může dojít z celé řady důvodů, mezi které patří velká velikost vstupních dat nebo nadměrné zpětné navracení způsobené vloženými kvantifikátory, zpětnými odkazy a dalšími faktory.</target>
198198
<note />
199199
</trans-unit>
200200
<trans-unit id="RegexMethodMustHaveValidSignatureMessage">
@@ -213,8 +213,8 @@
213213
<note />
214214
</trans-unit>
215215
<trans-unit id="ShorthandClassInCharacterRange">
216-
<source>Cannot include class \\{0} in character range.</source>
217-
<target state="translated">Do rozsahu znaků nejde zahrnout třídu \\{0}.</target>
216+
<source>Cannot include class \{0} in character range.</source>
217+
<target state="needs-review-translation">Do rozsahu znaků nejde zahrnout třídu \\{0}.</target>
218218
<note />
219219
</trans-unit>
220220
<trans-unit id="UndefinedNamedReference">
@@ -228,8 +228,8 @@
228228
<note />
229229
</trans-unit>
230230
<trans-unit id="UnescapedEndingBackslash">
231-
<source>Illegal \\ at end of pattern.</source>
232-
<target state="translated">Znak \\ na konci vzorku je neplatný.</target>
231+
<source>Illegal \ at end of pattern.</source>
232+
<target state="needs-review-translation">Znak \\ na konci vzorku je neplatný.</target>
233233
<note />
234234
</trans-unit>
235235
<trans-unit id="UnrecognizedControlCharacter">
@@ -238,8 +238,8 @@
238238
<note />
239239
</trans-unit>
240240
<trans-unit id="UnrecognizedEscape">
241-
<source>Unrecognized escape sequence \\{0}.</source>
242-
<target state="translated">Nerozpoznaná řídicí sekvence \\{0}.</target>
241+
<source>Unrecognized escape sequence \{0}.</source>
242+
<target state="needs-review-translation">Nerozpoznaná řídicí sekvence \\{0}.</target>
243243
<note />
244244
</trans-unit>
245245
<trans-unit id="UnrecognizedUnicodeProperty">

‎src/libraries/System.Text.RegularExpressions/gen/Resources/xlf/Strings.de.xlf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<note />
8989
</trans-unit>
9090
<trans-unit id="InsufficientOrInvalidHexDigits">
91-
<source>Insufficient hexadecimal digits.</source>
92-
<target state="translated">Nicht genügend Hexadezimalziffern.</target>
91+
<source>Insufficient or invalid hexadecimal digits.</source>
92+
<target state="needs-review-translation">Nicht genügend Hexadezimalziffern.</target>
9393
<note />
9494
</trans-unit>
9595
<trans-unit id="InvalidGroupingConstruct">
@@ -113,8 +113,8 @@
113113
<note>{Locked="GeneratedRegexAttribute"}</note>
114114
</trans-unit>
115115
<trans-unit id="InvalidUnicodePropertyEscape">
116-
<source>Incomplete \\p{X} character escape.</source>
117-
<target state="translated">Unvollständiges \\p{X}-Escape-Zeichen.</target>
116+
<source>Incomplete \p{X} character escape.</source>
117+
<target state="needs-review-translation">Unvollständiges \\p{X}-Escape-Zeichen.</target>
118118
<note />
119119
</trans-unit>
120120
<trans-unit id="LengthNotNegative">
@@ -138,13 +138,13 @@
138138
<note />
139139
</trans-unit>
140140
<trans-unit id="MalformedNamedReference">
141-
<source>Malformed \\k&lt;...&gt; named back reference.</source>
142-
<target state="translated">Falsch formatierter \\k&lt;...&gt; benannter Rückverweis.</target>
141+
<source>Malformed \k&lt;...&gt; named back reference.</source>
142+
<target state="needs-review-translation">Falsch formatierter \\k&lt;...&gt; benannter Rückverweis.</target>
143143
<note />
144144
</trans-unit>
145145
<trans-unit id="MalformedUnicodePropertyEscape">
146-
<source>Malformed \\p{X} character escape.</source>
147-
<target state="translated">Falsch formatiertes \\p{X}-Escape-Zeichen.</target>
146+
<source>Malformed \p{X} character escape.</source>
147+
<target state="needs-review-translation">Falsch formatiertes \\p{X}-Escape-Zeichen.</target>
148148
<note />
149149
</trans-unit>
150150
<trans-unit id="MissingControlCharacter">
@@ -193,8 +193,8 @@
193193
<note>{Locked="Int32.MaxValue"}</note>
194194
</trans-unit>
195195
<trans-unit id="RegexMatchTimeoutException_Occurred">
196-
<source>The RegEx engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</source>
197-
<target state="translated">Zeitüberschreitung des RegEx-Moduls beim Versuch, ein Muster mit einer Eingabezeichenfolge in Übereinstimmung zu bringen. Dies kann viele Ursachen haben, darunter sehr große Eingaben oder übermäßige Rückverfolgung aufgrund von geschachtelten Quantifizierern, Rückverweisen und anderen Faktoren.</target>
196+
<source>The Regex engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</source>
197+
<target state="needs-review-translation">Zeitüberschreitung des RegEx-Moduls beim Versuch, ein Muster mit einer Eingabezeichenfolge in Übereinstimmung zu bringen. Dies kann viele Ursachen haben, darunter sehr große Eingaben oder übermäßige Rückverfolgung aufgrund von geschachtelten Quantifizierern, Rückverweisen und anderen Faktoren.</target>
198198
<note />
199199
</trans-unit>
200200
<trans-unit id="RegexMethodMustHaveValidSignatureMessage">
@@ -213,8 +213,8 @@
213213
<note />
214214
</trans-unit>
215215
<trans-unit id="ShorthandClassInCharacterRange">
216-
<source>Cannot include class \\{0} in character range.</source>
217-
<target state="translated">Die Klasse \\{0} kann nicht in den Zeichenbereich eingeschlossen werden.</target>
216+
<source>Cannot include class \{0} in character range.</source>
217+
<target state="needs-review-translation">Die Klasse \\{0} kann nicht in den Zeichenbereich eingeschlossen werden.</target>
218218
<note />
219219
</trans-unit>
220220
<trans-unit id="UndefinedNamedReference">
@@ -228,8 +228,8 @@
228228
<note />
229229
</trans-unit>
230230
<trans-unit id="UnescapedEndingBackslash">
231-
<source>Illegal \\ at end of pattern.</source>
232-
<target state="translated">Unzulässiger \\ am Ende des Musters.</target>
231+
<source>Illegal \ at end of pattern.</source>
232+
<target state="needs-review-translation">Unzulässiger \\ am Ende des Musters.</target>
233233
<note />
234234
</trans-unit>
235235
<trans-unit id="UnrecognizedControlCharacter">
@@ -238,8 +238,8 @@
238238
<note />
239239
</trans-unit>
240240
<trans-unit id="UnrecognizedEscape">
241-
<source>Unrecognized escape sequence \\{0}.</source>
242-
<target state="translated">Unbekannte Escapesequenz \\{0}.</target>
241+
<source>Unrecognized escape sequence \{0}.</source>
242+
<target state="needs-review-translation">Unbekannte Escapesequenz \\{0}.</target>
243243
<note />
244244
</trans-unit>
245245
<trans-unit id="UnrecognizedUnicodeProperty">

‎src/libraries/System.Text.RegularExpressions/gen/Resources/xlf/Strings.es.xlf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<note />
8989
</trans-unit>
9090
<trans-unit id="InsufficientOrInvalidHexDigits">
91-
<source>Insufficient hexadecimal digits.</source>
92-
<target state="translated">Dígitos hexadecimales insuficientes.</target>
91+
<source>Insufficient or invalid hexadecimal digits.</source>
92+
<target state="needs-review-translation">Dígitos hexadecimales insuficientes.</target>
9393
<note />
9494
</trans-unit>
9595
<trans-unit id="InvalidGroupingConstruct">
@@ -113,8 +113,8 @@
113113
<note>{Locked="GeneratedRegexAttribute"}</note>
114114
</trans-unit>
115115
<trans-unit id="InvalidUnicodePropertyEscape">
116-
<source>Incomplete \\p{X} character escape.</source>
117-
<target state="translated">Escape de caracteres \\p{X} incompleto.</target>
116+
<source>Incomplete \p{X} character escape.</source>
117+
<target state="needs-review-translation">Escape de caracteres \\p{X} incompleto.</target>
118118
<note />
119119
</trans-unit>
120120
<trans-unit id="LengthNotNegative">
@@ -138,13 +138,13 @@
138138
<note />
139139
</trans-unit>
140140
<trans-unit id="MalformedNamedReference">
141-
<source>Malformed \\k&lt;...&gt; named back reference.</source>
142-
<target state="translated">Referencia inversa \\k&lt;...&gt; con nombre en formato incorrecto.</target>
141+
<source>Malformed \k&lt;...&gt; named back reference.</source>
142+
<target state="needs-review-translation">Referencia inversa \\k&lt;...&gt; con nombre en formato incorrecto.</target>
143143
<note />
144144
</trans-unit>
145145
<trans-unit id="MalformedUnicodePropertyEscape">
146-
<source>Malformed \\p{X} character escape.</source>
147-
<target state="translated">Escape de caracteres \\p{X} con formato incorrecto.</target>
146+
<source>Malformed \p{X} character escape.</source>
147+
<target state="needs-review-translation">Escape de caracteres \\p{X} con formato incorrecto.</target>
148148
<note />
149149
</trans-unit>
150150
<trans-unit id="MissingControlCharacter">
@@ -193,8 +193,8 @@
193193
<note>{Locked="Int32.MaxValue"}</note>
194194
</trans-unit>
195195
<trans-unit id="RegexMatchTimeoutException_Occurred">
196-
<source>The RegEx engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</source>
197-
<target state="translated">Se agotó el tiempo de espera mientras el motor de RegEx intentaba comparar una cadena de entrada con un patrón. Esto puede deberse a muchos motivos, como la especificación de cadenas de entrada muy grandes o búsquedas hacia atrás excesivas causadas por cuantificadores anidados, referencias inversas y otros factores.</target>
196+
<source>The Regex engine has timed out while trying to match a pattern to an input string. This can occur for many reasons, including very large inputs or excessive backtracking caused by nested quantifiers, back-references and other factors.</source>
197+
<target state="needs-review-translation">Se agotó el tiempo de espera mientras el motor de RegEx intentaba comparar una cadena de entrada con un patrón. Esto puede deberse a muchos motivos, como la especificación de cadenas de entrada muy grandes o búsquedas hacia atrás excesivas causadas por cuantificadores anidados, referencias inversas y otros factores.</target>
198198
<note />
199199
</trans-unit>
200200
<trans-unit id="RegexMethodMustHaveValidSignatureMessage">
@@ -213,8 +213,8 @@
213213
<note />
214214
</trans-unit>
215215
<trans-unit id="ShorthandClassInCharacterRange">
216-
<source>Cannot include class \\{0} in character range.</source>
217-
<target state="translated">No se puede incluir la clase \\{0} en el intervalo de caracteres.</target>
216+
<source>Cannot include class \{0} in character range.</source>
217+
<target state="needs-review-translation">No se puede incluir la clase \\{0} en el intervalo de caracteres.</target>
218218
<note />
219219
</trans-unit>
220220
<trans-unit id="UndefinedNamedReference">
@@ -228,8 +228,8 @@
228228
<note />
229229
</trans-unit>
230230
<trans-unit id="UnescapedEndingBackslash">
231-
<source>Illegal \\ at end of pattern.</source>
232-
<target state="translated">\\ no válido al final del patrón.</target>
231+
<source>Illegal \ at end of pattern.</source>
232+
<target state="needs-review-translation">\\ no válido al final del patrón.</target>
233233
<note />
234234
</trans-unit>
235235
<trans-unit id="UnrecognizedControlCharacter">
@@ -238,8 +238,8 @@
238238
<note />
239239
</trans-unit>
240240
<trans-unit id="UnrecognizedEscape">
241-
<source>Unrecognized escape sequence \\{0}.</source>
242-
<target state="translated">Secuencia de escape no reconocida \\{0}.</target>
241+
<source>Unrecognized escape sequence \{0}.</source>
242+
<target state="needs-review-translation">Secuencia de escape no reconocida \\{0}.</target>
243243
<note />
244244
</trans-unit>
245245
<trans-unit id="UnrecognizedUnicodeProperty">

0 commit comments

Comments
 (0)