[GR-23238] [GR-24428] Fixed handling of overflow in PythonObjectLibrary.asSize()

PullRequest: graalpython/1073

Author: otethal

graalpython/com.oracle.graal.python.test/src/tests/test_list.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2020, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -91,6 +91,10 @@ def imul(a, b): a *= b
         self.assertRaises((MemoryError, OverflowError), mul, lst, n)
         self.assertRaises((MemoryError, OverflowError), imul, lst, n)
 
+    def test_large_index(self):
+        lst = [0]
+        self.assertRaises(IndexError, lambda: lst[2**100])
+
     def test_repr_large(self):
 
         # Check the repr of large list objects

graalpython/com.oracle.graal.python.test/src/tests/test_string.py

@@ -54,6 +54,7 @@ def test_find():
     assert s.find('cau', MyIndexable(5), None) == 5
     assert s.find('cau', MyIndexable(5), MyIndexable(8)) == 5
     assert s.find('cau', None, MyIndexable(8)) == 5
+    assert s.find('cau', 2**100) == -1
 
 
 def test_rfind():

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_int.txt

@@ -1,6 +1,8 @@
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_basic
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_error_message
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_base_bad_types
+*graalpython.lib-python.3.test.test_int.IntTestCases.test_int_base_indexable
+*graalpython.lib-python.3.test.test_int.IntTestCases.test_int_base_limits
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_subclass_with_index
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_subclass_with_int
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_intconversion

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -1442,7 +1442,7 @@ Object parsePIntError(VirtualFrame frame, Object cls, String number, int base) {
         @Specialization(guards = "!isNoValue(base)", limit = "getCallSiteInlineCacheMaxDepth()")
         Object createIntError(VirtualFrame frame, Object cls, String number, Object base,
                         @CachedLibrary("base") PythonObjectLibrary lib) {
-            int intBase = lib.asSizeWithState(base, PArguments.getThreadState(frame));
+            int intBase = lib.asSizeWithState(base, null, PArguments.getThreadState(frame));
             checkBase(intBase);
             return stringToInt(frame, cls, number, intBase, number);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CastToJavaLongLossyNode.java

@@ -61,6 +61,14 @@ public static CastToJavaLongLossyNode getUncached() {
 
     @Specialization
     protected long toLong(PInt x) {
-        return x.longValue();
+        try {
+            return x.longValueExact();
+        } catch (ArithmeticException e) {
+            if (x.isNegative()) {
+                return Long.MIN_VALUE;
+            } else {
+                return Long.MAX_VALUE;
+            }
+        }
     }
 }