cpython: d5cda62d0f8c (original) (raw)

--- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9132,10 +9132,15 @@ PyUnicode_Count(PyObject *str, Py_ssize_t len1, len2; str_obj = PyUnicode_FromObject(str);

if (!str_obj || PyUnicode_READY(str_obj) == -1)

if (!str_obj) return -1; sub_obj = PyUnicode_FromObject(substr);

if (!sub_obj || PyUnicode_READY(sub_obj) == -1) {

if (!sub_obj) {
```
   Py_DECREF(str_obj);[](#l1.13)
```
```
   return -1;[](#l1.14)
```
}
if (PyUnicode_READY(substr) == -1 || PyUnicode_READY(str_obj) == -1) {
```
   Py_DECREF(substr);[](#l1.17)
   Py_DECREF(str_obj);[](#l1.18)
   return -1;[](#l1.19)
```
} @@ -9215,10 +9220,15 @@ PyUnicode_Find(PyObject *str, Py_ssize_t result; str = PyUnicode_FromObject(str);

if (!str || PyUnicode_READY(str) == -1)

if (!str) return -2; sub = PyUnicode_FromObject(sub);

if (!sub || PyUnicode_READY(sub) == -1) {

if (!sub) {
```
   Py_DECREF(str);[](#l1.31)
```
```
   return -2;[](#l1.32)
```
}
if (PyUnicode_READY(sub) == -1 || PyUnicode_READY(str) == -1) {
```
   Py_DECREF(sub);[](#l1.35)
   Py_DECREF(str);[](#l1.36)
   return -2;[](#l1.37)
```
} @@ -9857,8 +9867,12 @@ PyUnicode_Splitlines(PyObject *string, i PyObject *list; string = PyUnicode_FromObject(string);

if (string == NULL || PyUnicode_READY(string) == -1)
```
   return NULL;[](#l1.44)
```

if (string == NULL)
```
   return NULL;[](#l1.46)
```
if (PyUnicode_READY(string) == -1) {
```
   Py_DECREF(string);[](#l1.48)
```
```
   return NULL;[](#l1.49)
```
}

switch (PyUnicode_KIND(string)) { case PyUnicode_1BYTE_KIND: @@ -10650,14 +10664,16 @@ PyUnicode_Contains(PyObject *container, element->ob_type->tp_name); return -1; }

if (PyUnicode_READY(sub) == -1)
```
   return -1;[](#l1.59)
```

str = PyUnicode_FromObject(container);

if (!str || PyUnicode_READY(str) == -1) {

if (!str) { Py_DECREF(sub); return -1; }
if (PyUnicode_READY(sub) == -1 || PyUnicode_READY(str) == -1) {
```
   Py_DECREF(sub);[](#l1.68)
```
```
   Py_DECREF(str);[](#l1.69)
```
}

kind1 = PyUnicode_KIND(str); kind2 = PyUnicode_KIND(sub); @@ -11936,20 +11952,25 @@ PyUnicode_Replace(PyObject *obj, PyObject *result; self = PyUnicode_FromObject(obj);

if (self == NULL || PyUnicode_READY(self) == -1)

if (self == NULL) return NULL; str1 = PyUnicode_FromObject(subobj);

if (str1 == NULL || PyUnicode_READY(str1) == -1) {

if (str1 == NULL) { Py_DECREF(self); return NULL; } str2 = PyUnicode_FromObject(replobj);

if (str2 == NULL || PyUnicode_READY(str2)) {

if (str2 == NULL) { Py_DECREF(self); Py_DECREF(str1); return NULL; }

result = replace(self, str1, str2, maxcount);

if (PyUnicode_READY(self) == -1 ||

   PyUnicode_READY(str1) == -1 ||[](#l1.96)

   PyUnicode_READY(str2) == -1)[](#l1.97)

```
   result = NULL;[](#l1.98)
```
else
```
   result = replace(self, str1, str2, maxcount);[](#l1.100)
```
Py_DECREF(self); Py_DECREF(str1); Py_DECREF(str2); @@ -11973,18 +11994,20 @@ unicode_replace(PyObject *self, PyObject if (!PyArg_ParseTuple(args, "OO|n:replace", &str1, &str2, &maxcount)) return NULL;

if (!PyUnicode_READY(self) == -1)

if (PyUnicode_READY(self) == -1) return NULL; str1 = PyUnicode_FromObject(str1);

if (str1 == NULL || PyUnicode_READY(str1) == -1)

if (str1 == NULL) return NULL; str2 = PyUnicode_FromObject(str2);

if (str2 == NULL || PyUnicode_READY(str2) == -1) {

if (str2 == NULL) { Py_DECREF(str1); return NULL; } -

result = replace(self, str1, str2, maxcount);

if (PyUnicode_READY(str1) == -1 || PyUnicode_READY(str2) == -1)
```
   result = NULL;[](#l1.124)
```
else

   result = replace(self, str1, str2, maxcount);[](#l1.126)

Py_DECREF(str1); Py_DECREF(str2); @@ -12299,10 +12322,15 @@ PyUnicode_Partition(PyObject *str_in, Py Py_ssize_t len1, len2; str_obj = PyUnicode_FromObject(str_in);

if (!str_obj || PyUnicode_READY(str_obj) == -1)

if (!str_obj) return NULL; sep_obj = PyUnicode_FromObject(sep_in);

if (!sep_obj || PyUnicode_READY(sep_obj) == -1) {

if (!sep_obj) {
```
   Py_DECREF(str_obj);[](#l1.140)
```
```
   return NULL;[](#l1.141)
```
}
if (PyUnicode_READY(sep_obj) == -1 || PyUnicode_READY(str_obj) == -1) {
```
   Py_DECREF(sep_obj);[](#l1.144)
   Py_DECREF(str_obj);[](#l1.145)
   return NULL;[](#l1.146)
```
} @@ -13227,8 +13255,10 @@ PyUnicode_Format(PyObject *format, PyObj return NULL; } uformat = PyUnicode_FromObject(format);

if (uformat == NULL || PyUnicode_READY(uformat) == -1)
```
   return NULL;[](#l1.153)
```

if (uformat == NULL)
```
   return NULL;[](#l1.155)
```
if (PyUnicode_READY(uformat) == -1)
```
   Py_DECREF(uformat);[](#l1.157)
```
if (_PyAccu_Init(&acc)) goto onError; fmt = PyUnicode_DATA(uformat); @@ -13729,8 +13759,10 @@ unicode_subtype_new(PyTypeObject *type, if (unicode == NULL) return NULL; assert(_PyUnicode_CHECK(unicode));

if (PyUnicode_READY(unicode))
```
   return NULL;[](#l1.166)
```

if (PyUnicode_READY(unicode)) {
```
   Py_DECREF(unicode);[](#l1.168)
```
```
   return NULL;[](#l1.169)
```
}

self = type->tp_alloc(type, 0); if (self == NULL) {