Fix potential crash for Encoder.Convert (#20522)

GetByteCount will not return the right number of bytes needed, so GetBytes in Encoder.Convert will crash for some input Backport of #20271. Co-authored-by: jeffgoku <jeffreygoku@gmail.com>
mono · Oct 28, 2020 · a22ed3f · a22ed3f
1 parent 9707837
commit a22ed3f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/mcs/class/I18N/CJK/GB18030Encoding.cs b/mcs/class/I18N/CJK/GB18030Encoding.cs
@@ -430,10 +430,9 @@ public unsafe override int GetBytesImpl (char* chars, int charCount, byte* bytes
 		}
 #else
 
-		public override int GetByteCount(char[] chars, int index, int count, bool refresh)
+		public override int GetByteCount(char[] chars, int start, int count, bool refresh)
 		{
-			int start = 0;
-			int end = count;
+			int end = start + count;
 			int ret = 0;
 			while (start < end)
 			{