add IntPtr to int conversion bounds check (dotnet#5011)

tonerdo · Feb 12, 2019 · 74f24c9 · 74f24c9
1 parent 966ce8b
commit 74f24c9
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs b/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs
@@ -2166,7 +2166,11 @@ private void InterpretStoreElement(ILOpcode opcode)
                     index = indexItem.AsInt32();
                     break;
                 case StackValueKind.NativeInt:
-                    index = (int)indexItem.AsNativeInt();
+                    {
+                        long value = (long)indexItem.AsNativeInt();
+                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        index = (int)value;
+                    }
                     break;
                 default:
                     ThrowHelper.ThrowInvalidProgramException();
@@ -2224,7 +2228,11 @@ private void InterpretStoreElement(int token)
                     index = indexItem.AsInt32();
                     break;
                 case StackValueKind.NativeInt:
-                    index = (int)indexItem.AsNativeInt();
+                    {
+                        long value = (long)indexItem.AsNativeInt();
+                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        index = (int)value;
+                    }
                     break;
                 default:
                     ThrowHelper.ThrowInvalidProgramException();
@@ -2303,7 +2311,11 @@ private void InterpretLoadElement(ILOpcode opcode)
                     index = indexItem.AsInt32();
                     break;
                 case StackValueKind.NativeInt:
-                    index = (int)indexItem.AsNativeInt();
+                    {
+                        long value = (long)indexItem.AsNativeInt();
+                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        index = (int)value;
+                    }
                     break;
                 default:
                     ThrowHelper.ThrowInvalidProgramException();
@@ -2368,7 +2380,11 @@ private void InterpretLoadElement(int token)
                     index = indexItem.AsInt32();
                     break;
                 case StackValueKind.NativeInt:
-                    index = (int)indexItem.AsNativeInt();
+                    {
+                        long value = (long)indexItem.AsNativeInt();
+                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        index = (int)value;
+                    }
                     break;
                 default:
                     ThrowHelper.ThrowInvalidProgramException();