python · tonybaloney · Apr 8, 2019 · Apr 8, 2019 · zooba · Apr 12, 2019
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-04-08-04-45-02.bpo-36552.X5p6-M.rst b/Misc/NEWS.d/next/Core and Builtins/2019-04-08-04-45-02.bpo-36552.X5p6-M.rst
@@ -0,0 +1 @@
+Calculating the length of range objects whose length is larger than PY_SIZE_MAX will now raise a ValueError instead of an OverflowError.
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
@@ -212,7 +212,13 @@ compute_range_length(PyObject *start, PyObject *stop, PyObject *step)
 static Py_ssize_t
 range_length(rangeobject *r)
 {
-    return PyLong_AsSsize_t(r->length);
+    Py_ssize_t size = PyLong_AsSsize_t(r->length);
+    if (size < 0 && PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_OverflowError)) {
+        PyErr_Clear();
+        PyErr_Format(PyExc_ValueError, "Range object too large to calculate length (Overflow Error)");
+        return -1;
+    }
+    return size;
 }

 static PyObject *
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Calculating the length of range objects whose length is larger than PY_SIZE_MAX will now raise a ValueError instead of an OverflowError.
-Original file line number
+Diff line change
@@ -212,7 +212,13 @@ compute_range_length(PyObject *start, PyObject *stop, PyObject *step)
     static Py_ssize_t
     range_length(rangeobject *r)
     {
-        return PyLong_AsSsize_t(r->length);
+        Py_ssize_t size = PyLong_AsSsize_t(r->length);
+        if (size < 0 && PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_OverflowError)) {
+            PyErr_Clear();
+            PyErr_Format(PyExc_ValueError, "Range object too large to calculate length (Overflow Error)");
         Comment thread


        

        
      

        
          


  
    
        
        
  
    
      
          
      

      
            zooba
  

      

      

      


        Apr 12, 2019



      
    

  

  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        

  
  Member


        

    
  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      PyErr_Format is only valuable when using format characters :) You want PyErr_SetString here (also your lines are too long for our C style guidelines)
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
+            return -1;
+        }
+        return size;
     }
     static PyObject *
-          Expand Down