From d1b6cd7bfb35ffecd8b52d9d2b3cd608ab6515e0 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 27 May 2006 05:21:30 +0000
Subject: Fix Coverity warnings.  - Check the correct variable (str_obj, not
 str) for NULL  - sep_len was already verified it wasn't 0

---
 Objects/stringlib/partition.h | 7 +------
 Objects/unicodeobject.c       | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Objects/stringlib/partition.h b/Objects/stringlib/partition.h
index 8cc7abe..11a12c6 100644
--- a/Objects/stringlib/partition.h
+++ b/Objects/stringlib/partition.h
@@ -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);
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index d5935e3..783eb8f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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) {
-- 
cgit v0.12