Improve error handling for PyFloat_AsDouble/PyLong_AsLong/PyLong_AsUnsignedLong

Check the value before to avoid calling PyErr_Occurred

Author: lazka

cairo/context.c

@@ -901,7 +901,7 @@ pycairo_set_dash (PycairoContext *o, PyObject *args) {
     }
     dashes[i] = PyFloat_AsDouble(py_dash);
     Py_DECREF(py_dash);
-    if (PyErr_Occurred()) {
+    if (dashes[i] == -1.0 && PyErr_Occurred()) {
       PyMem_Free (dashes);
       Py_DECREF(py_dashes);
       return NULL;

cairo/enums.c

@@ -267,7 +267,7 @@ format_stride_for_width (PyObject *self, PyObject *args) {
     return NULL;
 
   value = PyLong_AsLong (self);
-  if (PyErr_Occurred())
+  if (value == -1 && PyErr_Occurred())
     return NULL;
   if (value > INT_MAX || value < INT_MIN) {
     PyErr_SetString (PyExc_ValueError, "format value out of range");

cairo/glyph.c

@@ -94,7 +94,7 @@ _PycairoGlyphs_AsGlyphs (PyObject *py_object, int *num_glyphs)
         }
         x = PyFloat_AsDouble (py_x);
         Py_DECREF (py_x);
-        if (PyErr_Occurred()) {
+        if (x == 1.0 && PyErr_Occurred()) {
             goto error;
         }
         PyObject *py_y = PySequence_ITEM (py_seq, 2);
@@ -103,7 +103,7 @@ _PycairoGlyphs_AsGlyphs (PyObject *py_object, int *num_glyphs)
         }
         y = PyFloat_AsDouble (py_y);
         Py_DECREF (py_y);
-        if (PyErr_Occurred()) {
+        if (y == 1.0 && PyErr_Occurred()) {
             goto error;
         }
 
@@ -149,7 +149,7 @@ _PyGlyph_AsGlyph (PyObject *pyobj, cairo_glyph_t *glyph) {
     }
     x = PyFloat_AsDouble (py_x);
     Py_DECREF (py_x);
-    if (PyErr_Occurred()) {
+    if (x == 1.0 && PyErr_Occurred()) {
         return -1;
     }
     PyObject *py_y = PySequence_ITEM (pyobj, 2);
@@ -158,7 +158,7 @@ _PyGlyph_AsGlyph (PyObject *pyobj, cairo_glyph_t *glyph) {
     }
     y = PyFloat_AsDouble (py_y);
     Py_DECREF (py_y);
-    if (PyErr_Occurred()) {
+    if (y == 1.0 && PyErr_Occurred()) {
         return -1;
     }
 

cairo/misc.c

@@ -199,7 +199,7 @@ _conv_pyobject_to_ulong (PyObject *pyobj, unsigned long *result) {
         return -1;
 
     temp = PyLong_AsUnsignedLong (pylong);
-    if (PyErr_Occurred ())
+    if (temp == (unsigned long)-1 && PyErr_Occurred ())
         return -1;
 
     *result = temp;