[Python-checkins] cpython (2.7): Issue #15604: Update uses of PyObject_IsTrue() to check for and handle errors
antoine.pitrou
python-checkins at python.org
Wed Aug 15 23:27:25 CEST 2012
http://hg.python.org/cpython/rev/ba1c48f8b571
changeset: 78603:ba1c48f8b571
branch: 2.7
parent: 78598:59f520542c1c
user: Antoine Pitrou <solipsis at pitrou.net>
date: Wed Aug 15 23:16:51 2012 +0200
summary:
Issue #15604: Update uses of PyObject_IsTrue() to check for and handle errors correctly.
Patch by Serhiy Storchaka.
files:
Misc/NEWS | 3 +
Modules/_csv.c | 8 +++-
Modules/_io/textio.c | 5 ++-
Modules/_ssl.c | 6 ++-
Modules/cStringIO.c | 6 ++-
Modules/itertoolsmodule.c | 17 ++++++--
Modules/parsermodule.c | 18 ++++++--
Modules/pyexpat.c | 54 +++++++++++++++------------
Objects/typeobject.c | 12 +++--
Python/bltinmodule.c | 22 ++++++++---
Python/import.c | 13 +++++-
11 files changed, 112 insertions(+), 52 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
Core and Builtins
-----------------
+- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle
+ errors correctly. Patch by Serhiy Storchaka.
+
- Issue #15041: Update "see also" list in tkinter documentation.
- Issue #14579: Fix error handling bug in the utf-16 decoder. Patch by
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -208,8 +208,12 @@
{
if (src == NULL)
*target = dflt;
- else
- *target = PyObject_IsTrue(src);
+ else {
+ int b = PyObject_IsTrue(src);
+ if (b < 0)
+ return -1;
+ *target = b;
+ }
return 0;
}
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1013,8 +1013,11 @@
res = PyObject_CallMethod(buffer, "seekable", NULL);
if (res == NULL)
goto error;
- self->seekable = self->telling = PyObject_IsTrue(res);
+ r = PyObject_IsTrue(res);
Py_DECREF(res);
+ if (r < 0)
+ goto error;
+ self->seekable = self->telling = r;
self->encoding_start_of_stream = 0;
if (self->seekable && self->encoder) {
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1005,6 +1005,7 @@
int len;
int verification;
PyObject *binary_mode = Py_None;
+ int b;
if (!PyArg_ParseTuple(args, "|O:peer_certificate", &binary_mode))
return NULL;
@@ -1012,7 +1013,10 @@
if (!self->peer_cert)
Py_RETURN_NONE;
- if (PyObject_IsTrue(binary_mode)) {
+ b = PyObject_IsTrue(binary_mode);
+ if (b < 0)
+ return NULL;
+ if (b) {
/* return cert in DER-encoded format */
unsigned char *bytes_buf = NULL;
diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c
--- a/Modules/cStringIO.c
+++ b/Modules/cStringIO.c
@@ -127,12 +127,16 @@
static PyObject *
IO_getval(IOobject *self, PyObject *args) {
PyObject *use_pos=Py_None;
+ int b;
Py_ssize_t s;
if (!IO__opencheck(self)) return NULL;
if (!PyArg_UnpackTuple(args,"getval", 0, 1,&use_pos)) return NULL;
- if (PyObject_IsTrue(use_pos)) {
+ b = PyObject_IsTrue(use_pos);
+ if (b < 0)
+ return NULL;
+ if (b) {
s=self->pos;
if (s > self->string_size) s=self->string_size;
}
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -903,11 +903,13 @@
}
ok = PyObject_IsTrue(good);
Py_DECREF(good);
- if (!ok) {
+ if (ok == 0) {
lz->start = 1;
return item;
}
Py_DECREF(item);
+ if (ok < 0)
+ return NULL;
}
}
@@ -1043,10 +1045,11 @@
}
ok = PyObject_IsTrue(good);
Py_DECREF(good);
- if (ok)
+ if (ok > 0)
return item;
Py_DECREF(item);
- lz->stop = 1;
+ if (ok == 0)
+ lz->stop = 1;
return NULL;
}
@@ -3001,9 +3004,11 @@
ok = PyObject_IsTrue(good);
Py_DECREF(good);
}
- if (ok)
+ if (ok > 0)
return item;
Py_DECREF(item);
+ if (ok < 0)
+ return NULL;
}
}
@@ -3144,9 +3149,11 @@
ok = PyObject_IsTrue(good);
Py_DECREF(good);
}
- if (!ok)
+ if (ok == 0)
return item;
Py_DECREF(item);
+ if (ok < 0)
+ return NULL;
}
}
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -350,10 +350,14 @@
int lineno = 0;
int col_offset = 0;
if (line_option != NULL) {
- lineno = (PyObject_IsTrue(line_option) != 0) ? 1 : 0;
+ lineno = PyObject_IsTrue(line_option);
+ if (lineno < 0)
+ return NULL;
}
if (col_option != NULL) {
- col_offset = (PyObject_IsTrue(col_option) != 0) ? 1 : 0;
+ col_offset = PyObject_IsTrue(col_option);
+ if (col_offset < 0)
+ return NULL;
}
/*
* Convert ST into a tuple representation. Use Guido's function,
@@ -401,10 +405,14 @@
int lineno = 0;
int col_offset = 0;
if (line_option != 0) {
- lineno = PyObject_IsTrue(line_option) ? 1 : 0;
+ lineno = PyObject_IsTrue(line_option);
+ if (lineno < 0)
+ return NULL;
}
- if (col_option != NULL) {
- col_offset = (PyObject_IsTrue(col_option) != 0) ? 1 : 0;
+ if (col_option != 0) {
+ col_offset = PyObject_IsTrue(col_option);
+ if (col_offset < 0)
+ return NULL;
}
/*
* Convert ST into a tuple representation. Use Guido's function,
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1174,13 +1174,16 @@
xmlparse_UseForeignDTD(xmlparseobject *self, PyObject *args)
{
PyObject *flagobj = NULL;
- XML_Bool flag = XML_TRUE;
+ int flag = 1;
enum XML_Error rc;
- if (!PyArg_UnpackTuple(args, "UseForeignDTD", 0, 1, &flagobj))
+ if (!PyArg_ParseTuple(args, "O:UseForeignDTD", &flagobj))
return NULL;
- if (flagobj != NULL)
- flag = PyObject_IsTrue(flagobj) ? XML_TRUE : XML_FALSE;
- rc = XML_UseForeignDTD(self->itself, flag);
+ if (flagobj != NULL) {
+ flag = PyObject_IsTrue(flagobj);
+ if (flag < 0)
+ return NULL;
+ }
+ rc = XML_UseForeignDTD(self->itself, flag ? XML_TRUE : XML_FALSE);
if (rc != XML_ERROR_NONE) {
return set_error(self, rc);
}
@@ -1549,7 +1552,10 @@
return -1;
}
if (strcmp(name, "buffer_text") == 0) {
- if (PyObject_IsTrue(v)) {
+ int b = PyObject_IsTrue(v);
+ if (b < 0)
+ return -1;
+ if (b) {
if (self->buffer == NULL) {
self->buffer = malloc(self->buffer_size);
if (self->buffer == NULL) {
@@ -1568,39 +1574,39 @@
return 0;
}
if (strcmp(name, "namespace_prefixes") == 0) {
- if (PyObject_IsTrue(v))
- self->ns_prefixes = 1;
- else
- self->ns_prefixes = 0;
+ int b = PyObject_IsTrue(v);
+ if (b < 0)
+ return -1;
+ self->ns_prefixes = b;
XML_SetReturnNSTriplet(self->itself, self->ns_prefixes);
return 0;
}
if (strcmp(name, "ordered_attributes") == 0) {
- if (PyObject_IsTrue(v))
- self->ordered_attributes = 1;
- else
- self->ordered_attributes = 0;
+ int b = PyObject_IsTrue(v);
+ if (b < 0)
+ return -1;
+ self->ordered_attributes = b;
return 0;
}
if (strcmp(name, "returns_unicode") == 0) {
- if (PyObject_IsTrue(v)) {
+ int b = PyObject_IsTrue(v);
+ if (b < 0)
+ return -1;
#ifndef Py_USING_UNICODE
+ if (b) {
PyErr_SetString(PyExc_ValueError,
"Unicode support not available");
return -1;
-#else
- self->returns_unicode = 1;
+ }
#endif
- }
- else
- self->returns_unicode = 0;
+ self->returns_unicode = b;
return 0;
}
if (strcmp(name, "specified_attributes") == 0) {
- if (PyObject_IsTrue(v))
- self->specified_attributes = 1;
- else
- self->specified_attributes = 0;
+ int b = PyObject_IsTrue(v);
+ if (b < 0)
+ return -1;
+ self->specified_attributes = b;
return 0;
}
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -327,11 +327,15 @@
abc.ABCMeta.__new__, so this function doesn't do anything
special to update subclasses.
*/
- int res;
+ int abstract, res;
if (value != NULL) {
+ abstract = PyObject_IsTrue(value);
+ if (abstract < 0)
+ return -1;
res = PyDict_SetItemString(type->tp_dict, "__abstractmethods__", value);
}
else {
+ abstract = 0;
res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__");
if (res && PyErr_ExceptionMatches(PyExc_KeyError)) {
PyErr_SetString(PyExc_AttributeError, "__abstractmethods__");
@@ -340,12 +344,10 @@
}
if (res == 0) {
PyType_Modified(type);
- if (value && PyObject_IsTrue(value)) {
+ if (abstract)
type->tp_flags |= Py_TPFLAGS_IS_ABSTRACT;
- }
- else {
+ else
type->tp_flags &= ~Py_TPFLAGS_IS_ABSTRACT;
- }
}
return res;
}
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -313,7 +313,7 @@
ok = PyObject_IsTrue(good);
Py_DECREF(good);
}
- if (ok) {
+ if (ok > 0) {
if (j < len)
PyList_SET_ITEM(result, j, item);
else {
@@ -324,8 +324,11 @@
}
++j;
}
- else
+ else {
Py_DECREF(item);
+ if (ok < 0)
+ goto Fail_result_it;
+ }
}
@@ -2784,12 +2787,15 @@
}
ok = PyObject_IsTrue(good);
Py_DECREF(good);
- if (ok) {
+ if (ok > 0) {
if (PyTuple_SetItem(result, j++, item) < 0)
goto Fail_1;
}
- else
+ else {
Py_DECREF(item);
+ if (ok < 0)
+ goto Fail_1;
+ }
}
if (_PyTuple_Resize(&result, j) < 0)
@@ -2851,7 +2857,7 @@
ok = PyObject_IsTrue(good);
Py_DECREF(good);
}
- if (ok) {
+ if (ok > 0) {
Py_ssize_t reslen;
if (!PyString_Check(item)) {
PyErr_SetString(PyExc_TypeError, "can't filter str to str:"
@@ -2917,6 +2923,8 @@
}
}
Py_DECREF(item);
+ if (ok < 0)
+ goto Fail_1;
}
if (j < outlen)
@@ -2977,7 +2985,7 @@
ok = PyObject_IsTrue(good);
Py_DECREF(good);
}
- if (ok) {
+ if (ok > 0) {
Py_ssize_t reslen;
if (!PyUnicode_Check(item)) {
PyErr_SetString(PyExc_TypeError,
@@ -3032,6 +3040,8 @@
}
}
Py_DECREF(item);
+ if (ok < 0)
+ goto Fail_1;
}
if (j < outlen)
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -1043,7 +1043,10 @@
name, pathname);
if (cpathname) {
PyObject *ro = PySys_GetObject("dont_write_bytecode");
- if (ro == NULL || !PyObject_IsTrue(ro))
+ int b = (ro == NULL) ? 0 : PyObject_IsTrue(ro);
+ if (b < 0)
+ goto error_exit;
+ if (!b)
write_compiled_module(co, cpathname, &st);
}
}
@@ -2200,7 +2203,13 @@
}
if (fromlist != NULL) {
- if (fromlist == Py_None || !PyObject_IsTrue(fromlist))
+ int b = (fromlist == Py_None) ? 0 : PyObject_IsTrue(fromlist);
+ if (b < 0) {
+ Py_DECREF(tail);
+ Py_DECREF(head);
+ goto error_exit;
+ }
+ if (!b)
fromlist = NULL;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list