Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix crash in fixer on certain invalid patterns #80007

Merged
merged 10 commits into from
Jan 5, 2023
Merged

Fix crash in fixer on certain invalid patterns #80007

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c53c3c1
Add test
danmoseley Dec 28, 2022
c097c9d
Fix
danmoseley Dec 28, 2022
243fe64
Tweak strings
danmoseley Dec 28, 2022
4d421a7
remove inadvertent test
danmoseley Dec 28, 2022
2996b4c
Improve condition
danmoseley Dec 28, 2022
5acf490
more strings
danmoseley Dec 30, 2022
73a356e
do not offer fix
danmoseley Jan 3, 2023
118b805
comment
danmoseley Jan 4, 2023
ad42ae3
Merge branch 'main' into fixanalyzer1
danmoseley Jan 5, 2023
0effa01
Update src/libraries/System.Text.RegularExpressions/gen/UpgradeToGene…
buyaa-n Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more strings
  • Loading branch information
@danmoseley
danmoseley committed Dec 30, 2022
commit 5acf49010ca41dde468bde9ce5647bdfcbe4d7ec
14 changes: 7 additions & 7 deletions src/libraries/System.Text.RegularExpressions/gen/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
</data>
<data name="ShorthandClassInCharacterRange" xml:space="preserve">
<value>Cannot include class \\{0} in character range.</value>
<value>Cannot include class \{0} in character range.</value>
</data>
<data name="BeginIndexNotNegative" xml:space="preserve">
<value>Start index cannot be less than 0 or greater than input length.</value>
Expand All @@ -178,13 +178,13 @@
<value>AppDomain data '{0}' contains the invalid value or object '{1}' for specifying a default matching timeout for System.Text.RegularExpressions.Regex.</value>
</data>
<data name="UnescapedEndingBackslash" xml:space="preserve">
<value>Illegal \\ at end of pattern.</value>
<value>Illegal \ at end of pattern.</value>
</data>
<data name="ReversedQuantifierRange" xml:space="preserve">
<value>Illegal {x,y} with x &gt; y.</value>
</data>
<data name="InvalidUnicodePropertyEscape" xml:space="preserve">
<value>Incomplete \\p{X} character escape.</value>
<value>Incomplete \p{X} character escape.</value>
</data>
<data name="CaptureGroupNameInvalid" xml:space="preserve">
<value>Invalid group name: Group names must begin with a word character.</value>
Expand All @@ -193,13 +193,13 @@
<value>Length cannot be less than 0 or exceed input length.</value>
</data>
<data name="MalformedNamedReference" xml:space="preserve">
<value>Malformed \\k&lt;...&gt; named back reference.</value>
<value>Malformed \k&lt;...&gt; named back reference.</value>
</data>
<data name="AlternationHasMalformedReference" xml:space="preserve">
<value>Conditional alternation is missing a closing parenthesis after the group number {0}.</value>
</data>
<data name="MalformedUnicodePropertyEscape" xml:space="preserve">
<value>Malformed \\p{X} character escape.</value>
<value>Malformed \p{X} character escape.</value>
</data>
<data name="MakeException" xml:space="preserve">
<value>Invalid pattern '{0}' at offset {1}. {2}</value>
Expand All @@ -226,7 +226,7 @@
<value>Quantifier '{0}' following nothing.</value>
</data>
<data name="RegexMatchTimeoutException_Occurred" xml:space="preserve">
<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>
<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>
</data>
<data name="ReversedCharacterRange" xml:space="preserve">
<value>[x-y] range in reverse order.</value>
Expand All @@ -235,7 +235,7 @@
<value>A subtraction must be the last element in a character class.</value>
</data>
<data name="InsufficientOrInvalidHexDigits" xml:space="preserve">
<value>Insufficient hexadecimal digits.</value>
<value>Insufficient or invalid hexadecimal digits.</value>
</data>
<data name="AlternationHasTooManyConditions" xml:space="preserve">
<value>Too many | in (?()|).</value>
Expand Down
28 changes: 14 additions & 14 deletions src/libraries/System.Text.RegularExpressions/gen/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<note />
</trans-unit>
<trans-unit id="InsufficientOrInvalidHexDigits">
<source>Insufficient hexadecimal digits.</source>
<target state="translated">Nedostatek šestnáctkových číslic.</target>
<source>Insufficient or invalid hexadecimal digits.</source>
<target state="needs-review-translation">Nedostatek šestnáctkových číslic.</target>
<note />
</trans-unit>
<trans-unit id="InvalidGroupingConstruct">
Expand All @@ -113,8 +113,8 @@
<note>{Locked="GeneratedRegexAttribute"}</note>
</trans-unit>
<trans-unit id="InvalidUnicodePropertyEscape">
<source>Incomplete \\p{X} character escape.</source>
<target state="translated">Neúplné uvození znaků \\p{X}.</target>
<source>Incomplete \p{X} character escape.</source>
<target state="needs-review-translation">Neúplné uvození znaků \\p{X}.</target>
<note />
</trans-unit>
<trans-unit id="LengthNotNegative">
Expand All @@ -138,13 +138,13 @@
<note />
</trans-unit>
<trans-unit id="MalformedNamedReference">
<source>Malformed \\k&lt;...&gt; named back reference.</source>
<target state="translated">Chybně naformátovaný pojmenovaný zpětný odkaz \\k&lt;...&gt;.</target>
<source>Malformed \k&lt;...&gt; named back reference.</source>
<target state="needs-review-translation">Chybně naformátovaný pojmenovaný zpětný odkaz \\k&lt;...&gt;.</target>
<note />
</trans-unit>
<trans-unit id="MalformedUnicodePropertyEscape">
<source>Malformed \\p{X} character escape.</source>
<target state="translated">Chybně formátovaná řídicí sekvence znaků \\p{X}.</target>
<source>Malformed \p{X} character escape.</source>
<target state="needs-review-translation">Chybně formátovaná řídicí sekvence znaků \\p{X}.</target>
<note />
</trans-unit>
<trans-unit id="MissingControlCharacter">
Expand Down Expand Up @@ -193,8 +193,8 @@
<note>{Locked="Int32.MaxValue"}</note>
</trans-unit>
<trans-unit id="RegexMatchTimeoutException_Occurred">
<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>
<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>
<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>
<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>
<note />
</trans-unit>
<trans-unit id="RegexMethodMustHaveValidSignatureMessage">
Expand All @@ -213,8 +213,8 @@
<note />
</trans-unit>
<trans-unit id="ShorthandClassInCharacterRange">
<source>Cannot include class \\{0} in character range.</source>
<target state="translated">Do rozsahu znaků nejde zahrnout třídu \\{0}.</target>
<source>Cannot include class \{0} in character range.</source>
<target state="needs-review-translation">Do rozsahu znaků nejde zahrnout třídu \\{0}.</target>
<note />
</trans-unit>
<trans-unit id="UndefinedNamedReference">
Expand All @@ -228,8 +228,8 @@
<note />
</trans-unit>
<trans-unit id="UnescapedEndingBackslash">
<source>Illegal \\ at end of pattern.</source>
<target state="translated">Znak \\ na konci vzorku je neplatný.</target>
<source>Illegal \ at end of pattern.</source>
<target state="needs-review-translation">Znak \\ na konci vzorku je neplatný.</target>
<note />
</trans-unit>
<trans-unit id="UnrecognizedControlCharacter">
Expand Down
28 changes: 14 additions & 14 deletions src/libraries/System.Text.RegularExpressions/gen/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<note />
</trans-unit>
<trans-unit id="InsufficientOrInvalidHexDigits">
<source>Insufficient hexadecimal digits.</source>
<target state="translated">Nicht genügend Hexadezimalziffern.</target>
<source>Insufficient or invalid hexadecimal digits.</source>
<target state="needs-review-translation">Nicht genügend Hexadezimalziffern.</target>
<note />
</trans-unit>
<trans-unit id="InvalidGroupingConstruct">
Expand All @@ -113,8 +113,8 @@
<note>{Locked="GeneratedRegexAttribute"}</note>
</trans-unit>
<trans-unit id="InvalidUnicodePropertyEscape">
<source>Incomplete \\p{X} character escape.</source>
<target state="translated">Unvollständiges \\p{X}-Escape-Zeichen.</target>
<source>Incomplete \p{X} character escape.</source>
<target state="needs-review-translation">Unvollständiges \\p{X}-Escape-Zeichen.</target>
<note />
</trans-unit>
<trans-unit id="LengthNotNegative">
Expand All @@ -138,13 +138,13 @@
<note />
</trans-unit>
<trans-unit id="MalformedNamedReference">
<source>Malformed \\k&lt;...&gt; named back reference.</source>
<target state="translated">Falsch formatierter \\k&lt;...&gt; benannter Rückverweis.</target>
<source>Malformed \k&lt;...&gt; named back reference.</source>
<target state="needs-review-translation">Falsch formatierter \\k&lt;...&gt; benannter Rückverweis.</target>
<note />
</trans-unit>
<trans-unit id="MalformedUnicodePropertyEscape">
<source>Malformed \\p{X} character escape.</source>
<target state="translated">Falsch formatiertes \\p{X}-Escape-Zeichen.</target>
<source>Malformed \p{X} character escape.</source>
<target state="needs-review-translation">Falsch formatiertes \\p{X}-Escape-Zeichen.</target>
<note />
</trans-unit>
<trans-unit id="MissingControlCharacter">
Expand Down Expand Up @@ -193,8 +193,8 @@
<note>{Locked="Int32.MaxValue"}</note>
</trans-unit>
<trans-unit id="RegexMatchTimeoutException_Occurred">
<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>
<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>
<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>
<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>
<note />
</trans-unit>
<trans-unit id="RegexMethodMustHaveValidSignatureMessage">
Expand All @@ -213,8 +213,8 @@
<note />
</trans-unit>
<trans-unit id="ShorthandClassInCharacterRange">
<source>Cannot include class \\{0} in character range.</source>
<target state="translated">Die Klasse \\{0} kann nicht in den Zeichenbereich eingeschlossen werden.</target>
<source>Cannot include class \{0} in character range.</source>
<target state="needs-review-translation">Die Klasse \\{0} kann nicht in den Zeichenbereich eingeschlossen werden.</target>
<note />
</trans-unit>
<trans-unit id="UndefinedNamedReference">
Expand All @@ -228,8 +228,8 @@
<note />
</trans-unit>
<trans-unit id="UnescapedEndingBackslash">
<source>Illegal \\ at end of pattern.</source>
<target state="translated">Unzulässiger \\ am Ende des Musters.</target>
<source>Illegal \ at end of pattern.</source>
<target state="needs-review-translation">Unzulässiger \\ am Ende des Musters.</target>
<note />
</trans-unit>
<trans-unit id="UnrecognizedControlCharacter">
Expand Down
28 changes: 14 additions & 14 deletions src/libraries/System.Text.RegularExpressions/gen/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<note />
</trans-unit>
<trans-unit id="InsufficientOrInvalidHexDigits">
<source>Insufficient hexadecimal digits.</source>
<target state="translated">Dígitos hexadecimales insuficientes.</target>
<source>Insufficient or invalid hexadecimal digits.</source>
<target state="needs-review-translation">Dígitos hexadecimales insuficientes.</target>
<note />
</trans-unit>
<trans-unit id="InvalidGroupingConstruct">
Expand All @@ -113,8 +113,8 @@
<note>{Locked="GeneratedRegexAttribute"}</note>
</trans-unit>
<trans-unit id="InvalidUnicodePropertyEscape">
<source>Incomplete \\p{X} character escape.</source>
<target state="translated">Escape de caracteres \\p{X} incompleto.</target>
<source>Incomplete \p{X} character escape.</source>
<target state="needs-review-translation">Escape de caracteres \\p{X} incompleto.</target>
<note />
</trans-unit>
<trans-unit id="LengthNotNegative">
Expand All @@ -138,13 +138,13 @@
<note />
</trans-unit>
<trans-unit id="MalformedNamedReference">
<source>Malformed \\k&lt;...&gt; named back reference.</source>
<target state="translated">Referencia inversa \\k&lt;...&gt; con nombre en formato incorrecto.</target>
<source>Malformed \k&lt;...&gt; named back reference.</source>
<target state="needs-review-translation">Referencia inversa \\k&lt;...&gt; con nombre en formato incorrecto.</target>
<note />
</trans-unit>
<trans-unit id="MalformedUnicodePropertyEscape">
<source>Malformed \\p{X} character escape.</source>
<target state="translated">Escape de caracteres \\p{X} con formato incorrecto.</target>
<source>Malformed \p{X} character escape.</source>
<target state="needs-review-translation">Escape de caracteres \\p{X} con formato incorrecto.</target>
<note />
</trans-unit>
<trans-unit id="MissingControlCharacter">
Expand Down Expand Up @@ -193,8 +193,8 @@
<note>{Locked="Int32.MaxValue"}</note>
</trans-unit>
<trans-unit id="RegexMatchTimeoutException_Occurred">
<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>
<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>
<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>
<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>
<note />
</trans-unit>
<trans-unit id="RegexMethodMustHaveValidSignatureMessage">
Expand All @@ -213,8 +213,8 @@
<note />
</trans-unit>
<trans-unit id="ShorthandClassInCharacterRange">
<source>Cannot include class \\{0} in character range.</source>
<target state="translated">No se puede incluir la clase \\{0} en el intervalo de caracteres.</target>
<source>Cannot include class \{0} in character range.</source>
<target state="needs-review-translation">No se puede incluir la clase \\{0} en el intervalo de caracteres.</target>
<note />
</trans-unit>
<trans-unit id="UndefinedNamedReference">
Expand All @@ -228,8 +228,8 @@
<note />
</trans-unit>
<trans-unit id="UnescapedEndingBackslash">
<source>Illegal \\ at end of pattern.</source>
<target state="translated">\\ no válido al final del patrón.</target>
<source>Illegal \ at end of pattern.</source>
<target state="needs-review-translation">\\ no válido al final del patrón.</target>
<note />
</trans-unit>
<trans-unit id="UnrecognizedControlCharacter">
Expand Down
Loading