From f97569360a2a0984a31270f75bcf7ba7e60c44d3 Mon Sep 17 00:00:00 2001 From: John Chen Date: Wed, 30 Sep 2015 21:08:57 -0700 Subject: Fix SigPointer::PeekValueTypeTokenClosed to handle generic instantiation represented by ELEMENT_TYPE_INTERNAL Integrate change #1529861 from NetFXDev1 [tfs-changeset: 1532127] --- src/vm/siginfo.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/vm/siginfo.cpp') diff --git a/src/vm/siginfo.cpp b/src/vm/siginfo.cpp index dd57e63840..25fe157784 100644 --- a/src/vm/siginfo.cpp +++ b/src/vm/siginfo.cpp @@ -2546,8 +2546,12 @@ mdTypeRef SigPointer::PeekValueTypeTokenClosed(Module *pModule, const SigTypeCon if (FAILED(sp.GetElemType(NULL))) return mdTokenNil; - if (FAILED(sp.GetElemType(NULL))) + CorElementType subtype; + if (FAILED(sp.GetElemType(&subtype))) + return mdTokenNil; + if (subtype == ELEMENT_TYPE_INTERNAL) return mdTokenNil; + _ASSERTE(subtype == ELEMENT_TYPE_VALUETYPE); if (FAILED(sp.GetToken(&token))) return mdTokenNil; -- cgit v1.2.3