summaryrefslogtreecommitdiff
path: root/src/vm/mlinfo.cpp
diff options
context:
space:
mode:
authorJeremy Koritzinsky <jekoritz@microsoft.com>2019-09-17 12:26:35 -0700
committerGitHub <noreply@github.com>2019-09-17 12:26:35 -0700
commit82f0216940e8201214debdcc9ce34f376801c60a (patch)
tree19c78e77bba0e1d64b32d4125a38a29bb81bc392 /src/vm/mlinfo.cpp
parent012b987f4d2c5af26f1e76c81a75e938e5b219f8 (diff)
downloadcoreclr-82f0216940e8201214debdcc9ce34f376801c60a.tar.gz
coreclr-82f0216940e8201214debdcc9ce34f376801c60a.tar.bz2
coreclr-82f0216940e8201214debdcc9ce34f376801c60a.zip
[release/3.1] Fix marshalling a pinnable multi-dimensional arr… (#26664)
* Use the exact methodtable of the parameter to calculate the offset into a pinned array.
Diffstat (limited to 'src/vm/mlinfo.cpp')
-rw-r--r--src/vm/mlinfo.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm/mlinfo.cpp b/src/vm/mlinfo.cpp
index 4e5ddf9588..586044ba94 100644
--- a/src/vm/mlinfo.cpp
+++ b/src/vm/mlinfo.cpp
@@ -2802,6 +2802,8 @@ MarshalInfo::MarshalInfo(Module* pModule,
}
}
+ m_args.na.m_pArrayMT = arrayTypeHnd.GetMethodTable();
+
// Handle retrieving the information for the array type.
IfFailGoto(HandleArrayElemType(&ParamInfo, thElement, asArray->GetRank(), mtype == ELEMENT_TYPE_SZARRAY, isParam, pAssembly), lFail);
break;