@@ -1603,8 +1603,8 @@ public async Task<JObject> InvokeMethod(ArraySegment<byte> valueTypeBuffer, int
16031603
16041604 public async Task < JObject > InvokeMethodInObject ( DotnetObjectId objectId , int methodId , string varName , CancellationToken token )
16051605 {
1606- if ( objectId . IsValueType )
1607- return await InvokeMethod ( valueTypes [ objectId . Value ] . valueTypeBuffer , methodId , varName , token ) ;
1606+ if ( objectId . IsValueType && valueTypes . TryGetValue ( objectId . Value , out var valueType ) )
1607+ return await InvokeMethod ( valueType . valueTypeBuffer , methodId , varName , token ) ;
16081608 using var commandParamsObjWriter = new MonoBinaryWriter ( ) ;
16091609 commandParamsObjWriter . Write ( ElementType . Class , objectId . Value ) ;
16101610 return await InvokeMethod ( commandParamsObjWriter . GetParameterBuffer ( ) , methodId , varName , token ) ;
@@ -2204,13 +2204,15 @@ public async Task<JArray> StackFrameGetValues(MethodInfoWithDebugInformation met
22042204
22052205 public async Task < JArray > GetValueTypeValues ( int valueTypeId , bool accessorPropertiesOnly , CancellationToken token )
22062206 {
2207- if ( valueTypes [ valueTypeId ] . valueTypeJsonProps == null )
2207+ if ( ! valueTypes . TryGetValue ( valueTypeId , out ValueTypeClass valueType ) )
2208+ return null ;
2209+ if ( valueType . valueTypeJsonProps == null )
22082210 {
2209- valueTypes [ valueTypeId ] . valueTypeJsonProps = await GetPropertiesValuesOfValueType ( valueTypeId , token ) ;
2211+ valueType . valueTypeJsonProps = await GetPropertiesValuesOfValueType ( valueTypeId , token ) ;
22102212 }
22112213 if ( accessorPropertiesOnly )
2212- return valueTypes [ valueTypeId ] . valueTypeJsonProps ;
2213- var ret = new JArray ( valueTypes [ valueTypeId ] . valueTypeJson . Union ( valueTypes [ valueTypeId ] . valueTypeJsonProps ) ) ;
2214+ return valueType . valueTypeJsonProps ;
2215+ var ret = new JArray ( valueType . valueTypeJson . Union ( valueType . valueTypeJsonProps ) ) ;
22142216 return ret ;
22152217 }
22162218
0 commit comments