summaryrefslogtreecommitdiff
path: root/src/vm
diff options
context:
space:
mode:
authorJeremy Koritzinsky <jkoritzinsky@gmail.com>2019-01-03 21:35:53 -0800
committerGitHub <noreply@github.com>2019-01-03 21:35:53 -0800
commit08019ac94eb8cd57abad4d03c803371290cfe210 (patch)
treeb396187fee729645804f0eafc220eef54bce26e1 /src/vm
parent9f446067444fb0218b4504e2ab6921fd7492d4a2 (diff)
downloadcoreclr-08019ac94eb8cd57abad4d03c803371290cfe210.tar.gz
coreclr-08019ac94eb8cd57abad4d03c803371290cfe210.tar.bz2
coreclr-08019ac94eb8cd57abad4d03c803371290cfe210.zip
Add test for StringBuilder null terminator implementation detail (#21800)
* Remove some commented out code. * Add test verifying that we put a null terminator 2-past the end of the native buffer allocated for a StringBuilder.
Diffstat (limited to 'src/vm')
-rw-r--r--src/vm/ilmarshalers.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/vm/ilmarshalers.cpp b/src/vm/ilmarshalers.cpp
index 8b6b15e398..d3869c28b1 100644
--- a/src/vm/ilmarshalers.cpp
+++ b/src/vm/ilmarshalers.cpp
@@ -772,17 +772,9 @@ void ILWSTRBufferMarshaler::EmitConvertContentsCLRToNative(ILCodeStream* pslILEm
pslILEmit->EmitCALL(METHOD__STRING_BUILDER__GET_LENGTH, 1, 1);
// stack: StringBuilder length
-
- // if (!fConvertSpaceJustCalled)
- {
- // we don't need to double-check the length because the length
- // must be smaller than the capacity and the capacity was already
- // checked by EmitConvertSpaceCLRToNative
-
- pslILEmit->EmitDUP();
- // static void StubHelpers.CheckStringLength(int length)
- pslILEmit->EmitCALL(METHOD__STUBHELPERS__CHECK_STRING_LENGTH, 1, 0);
- }
+ pslILEmit->EmitDUP();
+ // static void StubHelpers.CheckStringLength(int length)
+ pslILEmit->EmitCALL(METHOD__STUBHELPERS__CHECK_STRING_LENGTH, 1, 0);
// stack: StringBuilder length