Attachment 613627 Details for Bug 857875 – Remove the unnecessary range check in pycurl

[patch] Remove the unnecessary range check in pycurl

write_callback.patch (text/plain), 1.11 KB, created by Zdeněk Pavlas on 2012-09-17 10:47:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zdeněk Pavlas

Created: 2012-09-17 10:47:58 UTC

Size: 1.11 KB

patch

obsolete

>--- pycurl-7.19.0/src/pycurl.c.orig	2012-09-17 12:05:32.826796867 +0200
>+++ pycurl-7.19.0/src/pycurl.c	2012-09-17 12:06:11.656437198 +0200
>@@ -1085,20 +1085,7 @@ util_write_callback(int flags, char *ptr
>         ret = total_size;           /* None means success */
>     }
>     else if (PyInt_Check(result)) {
>-        long obj_size = PyInt_AsLong(result);
>-        if (obj_size < 0 || obj_size > total_size) {
>-            PyErr_Format(ErrorObject, "invalid return value for write callback %ld %ld", (long)obj_size, (long)total_size);
>-            goto verbose_error;
>-        }
>-        ret = (size_t) obj_size;    /* success */
>-    }
>-    else if (PyLong_Check(result)) {
>-        long obj_size = PyLong_AsLong(result);
>-        if (obj_size < 0 || obj_size > total_size) {
>-            PyErr_Format(ErrorObject, "invalid return value for write callback %ld %ld", (long)obj_size, (long)total_size);
>-            goto verbose_error;
>-        }
>-        ret = (size_t) obj_size;    /* success */
>+        ret = (int) PyInt_AsLong(result);
>     }
>     else {
>         PyErr_SetString(ErrorObject, "write callback must return int or None");

Actions: View | Diff

Attachments on bug 857875: 613627 | 658097 | 703018 | 703490 | 703505 | 703527 | 705949