Commit 4da6fd63 authored by Marc-André Lemburg's avatar Marc-André Lemburg

Fix for bug [ 561796 ] string.find causes lazy error

parent 1e1542fc
...@@ -983,7 +983,8 @@ extern DL_IMPORT(int) PyUnicode_Tailmatch( ...@@ -983,7 +983,8 @@ extern DL_IMPORT(int) PyUnicode_Tailmatch(
); );
/* Return the first position of substr in str[start:end] using the /* Return the first position of substr in str[start:end] using the
given search direction or -1 if not found. */ given search direction or -1 if not found. -2 is returned in case
an error occurred and an exception is set. */
extern DL_IMPORT(int) PyUnicode_Find( extern DL_IMPORT(int) PyUnicode_Find(
PyObject *str, /* String */ PyObject *str, /* String */
......
...@@ -2887,11 +2887,11 @@ int PyUnicode_Find(PyObject *str, ...@@ -2887,11 +2887,11 @@ int PyUnicode_Find(PyObject *str,
str = PyUnicode_FromObject(str); str = PyUnicode_FromObject(str);
if (str == NULL) if (str == NULL)
return -1; return -2;
substr = PyUnicode_FromObject(substr); substr = PyUnicode_FromObject(substr);
if (substr == NULL) { if (substr == NULL) {
Py_DECREF(substr); Py_DECREF(substr);
return -1; return -2;
} }
result = findstring((PyUnicodeObject *)str, result = findstring((PyUnicodeObject *)str,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment