Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions

View File

@ -1118,8 +1118,12 @@ namespace System.Runtime.InteropServices
throw new OutOfMemoryException();
byte* pbMem = (byte*)pMem;
int nbWritten = s.GetBytesFromEncoding(pbMem, nb, Encoding.UTF8);
pbMem[nbWritten] = 0;
fixed (char* pwzChar = s)
{
int nbWritten = Encoding.UTF8.GetBytes(pwzChar, s.Length, pbMem, nb);
pbMem[nbWritten] = 0;
}
return pMem;
}