Merge pull request #6178 from MDoerner/FixCharToIntConversion

retailcoder · web-flow · commit 9323f703d5e6 · 2023-11-08T21:15:37.000-05:00
Fix unsafe conversion from Char to int
diff --git a/Rubberduck.Parsing/VBA/Extensions/StringExtensions.cs b/Rubberduck.Parsing/VBA/Extensions/StringExtensions.cs
@@ -148,7 +148,7 @@ public static string ToVbExpression(this string managed, bool useConsts = true)
             var literal = string.Empty;
             foreach (var character in managed.ToCharArray())
             {
-                var unicode = Convert.ToInt16(character) > byte.MaxValue;
+                var unicode = Convert.ToInt32(character) > byte.MaxValue;
                 var specialCased = VbCharacterConstants.ContainsKey(character);
                 if (specialCased || char.IsControl(character) && !unicode)
                 {

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public static string ToVbExpression(this string managed, bool useConsts = true)`
`148`	`148`	`var literal = string.Empty;`
`149`	`149`	`foreach (var character in managed.ToCharArray())`
`150`	`150`	`{`
`151`		`- var unicode = Convert.ToInt16(character) > byte.MaxValue;`
	`151`	`+ var unicode = Convert.ToInt32(character) > byte.MaxValue;`
`152`	`152`	`var specialCased = VbCharacterConstants.ContainsKey(character);`
`153`	`153`	`if (specialCased \|\| char.IsControl(character) && !unicode)`
`154`	`154`	`{`