diff options
| author | Brian Sullivan <briansul@microsoft.com> | 2016-07-08 19:14:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 19:14:10 -0700 |
| commit | d4fc9b7744b6d2deee2a8bd4ffa7793cc53fc833 (patch) | |
| tree | 24918c3106a57eef86ae06f4e37ee4a58a8add78 /src | |
| parent | 57b3450f4d232cd53d3b9a0f6566806d73fa4156 (diff) | |
| parent | 587690d0b6354a5056f16be5318427b19214b6cb (diff) | |
| download | coreclr-d4fc9b7744b6d2deee2a8bd4ffa7793cc53fc833.tar.gz coreclr-d4fc9b7744b6d2deee2a8bd4ffa7793cc53fc833.tar.bz2 coreclr-d4fc9b7744b6d2deee2a8bd4ffa7793cc53fc833.zip | |
Merge pull request #6190 from dotnet-bot/from-tfs
Merge changes from TFS
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm/fieldmarshaler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm/fieldmarshaler.cpp b/src/vm/fieldmarshaler.cpp index a1904e0864..0de71b592c 100644 --- a/src/vm/fieldmarshaler.cpp +++ b/src/vm/fieldmarshaler.cpp @@ -3375,7 +3375,7 @@ VOID FieldMarshaler_FixedStringAnsi::UpdateNativeImpl(OBJECTREF* pCLRValue, LPVO // character, but for multibyte chars nc>= m_numchar check won't truncate since GetStringLength // gives number of characters but not the actual number of bytes. For such cases need to make // sure that we dont write one past the buffer. - if (cbwritten == m_numchar) + if (cbwritten == (int) m_numchar) --cbwritten; ((CHAR*)pNativeValue)[cbwritten] = '\0'; |