Fix problems found by Coverity.
longobject.c: also fix an ssize_t problem
<a> could have been NULL, so hoist the size calc to not use <a>.
_ssl.c: under fail: self is DECREF'd, but it would have been NULL.
_elementtree.c: delete self if there was an error.
_csv.c: I'm not sure if lineterminator could have been anything other than
a string. However, other string method calls are checked, so check this
one too.
diff --git a/Modules/_csv.c b/Modules/_csv.c
index 67d5d9f..5e03635 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -1104,6 +1104,8 @@
char *terminator;
terminator_len = PyString_Size(self->dialect->lineterminator);
+ if (terminator_len == -1)
+ return 0;
/* grow record buffer if necessary */
if (!join_check_rec_size(self, self->rec_len + terminator_len))
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 06ae24c..3dd5c26 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -327,8 +327,10 @@
if (attrib != Py_None) {
- if (element_new_extra(self, attrib) < 0)
+ if (element_new_extra(self, attrib) < 0) {
+ PyObject_Del(self);
return NULL;
+ }
self->extra->length = 0;
self->extra->allocated = STATIC_CHILDREN;
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4c0da6f..afe699b 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -183,9 +183,9 @@
int sockstate;
self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */
- if (self == NULL){
- errstr = "newPySSLObject error";
- goto fail;
+ if (self == NULL) {
+ PyErr_SetString(PySSLErrorObject, "newPySSLObject error");
+ return NULL;
}
memset(self->server, '\0', sizeof(char) * X509_NAME_MAXLEN);
memset(self->issuer, '\0', sizeof(char) * X509_NAME_MAXLEN);