Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix Coverity warnings. 

- Check the correct variable (str_obj, not str) for NULL
 - sep_len was already verified it wasn't 0
This commit is contained in:
Neal Norwitz 2006-05-27 05:21:30 +00:00
parent 2f3136b8f0
commit d1b6cd7bfb
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Objects/stringlib/partition.h
View File

@ -58,7 +58,7 @@ stringlib_rpartition(
)
{
PyObject* out;
Py_ssize_t pos;
Py_ssize_t pos, j;
if (sep_len == 0) {
PyErr_SetString(PyExc_ValueError, "empty separator");
@ -70,17 +70,12 @@ stringlib_rpartition(
return NULL;
/* XXX - create reversefastsearch helper! */
if (sep_len == 0)
pos = str_len;
else {
Py_ssize_t j;
pos = -1;
for (j = str_len - sep_len; j >= 0; --j)
if (STRINGLIB_CMP(str+j, sep, sep_len) == 0) {
pos = j;
break;
}
}
if (pos < 0) {
Py_INCREF(str_obj);

2
Objects/unicodeobject.c
View File

@ -3955,7 +3955,7 @@ Py_ssize_t PyUnicode_Find(PyObject *str,
PyUnicodeObject* sub_obj;
str_obj = (PyUnicodeObject*) PyUnicode_FromObject(str);
if (!str)
if (!str_obj)
return -2;
sub_obj = (PyUnicodeObject*) PyUnicode_FromObject(substr);
if (!sub_obj) {