diff options
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/fileobject.c | 4 | ||||
| -rw-r--r-- | Objects/stringobject.c | 13 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 34 |
3 files changed, 19 insertions, 32 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 3dd1034..029a270 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -1317,9 +1317,7 @@ file_readlines(PyFileObject *f, PyObject *args) goto error; } cleanup: - if (big_buffer) { - Py_DECREF(big_buffer); - } + Py_XDECREF(big_buffer); return list; } diff --git a/Objects/stringobject.c b/Objects/stringobject.c index d3c9e4b..5bad04e 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1869,8 +1869,8 @@ string_translate(PyStringObject *self, PyObject *args) return input_obj; } /* Fix the size of the resulting string */ - if (inlen > 0 &&_PyString_Resize(&result, output-output_start)) - return NULL; + if (inlen > 0) + _PyString_Resize(&result, output - output_start); return result; } @@ -2927,7 +2927,14 @@ PyString_ConcatAndDel(register PyObject **pv, register PyObject *w) is only one module referencing the object. You can also think of it as creating a new string object and destroying the old one, only more efficiently. In any case, don't use this if the string may - already be known to some other part of the code... */ + already be known to some other part of the code... + Note that if there's not enough memory to resize the string, the original + string object at *pv is deallocated, *pv is set to NULL, an "out of + memory" exception is set, and -1 is returned. Else (on success) 0 is + returned, and the value in *pv may or may not be the same as on input. + As always, an extra byte is allocated for a trailing \0 byte (newsize + does *not* include that), and a trailing \0 byte is stored. +*/ int _PyString_Resize(PyObject **pv, int newsize) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index c4c8d8d..9a3e456 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -927,10 +927,7 @@ PyObject *PyUnicode_EncodeUTF7(const Py_UNICODE *s, *out++ = '-'; } - if (_PyString_Resize(&v, out - start)) { - Py_DECREF(v); - return NULL; - } + _PyString_Resize(&v, out - start); return v; } @@ -1764,7 +1761,7 @@ PyObject *unicodeescape_string(const Py_UNICODE *s, /* Resize the string if necessary */ if (offset + 12 > PyString_GET_SIZE(repr)) { if (_PyString_Resize(&repr, PyString_GET_SIZE(repr) + 100)) - goto onError; + return NULL; p = PyString_AS_STRING(repr) + offset; } @@ -1847,14 +1844,8 @@ PyObject *unicodeescape_string(const Py_UNICODE *s, *p++ = PyString_AS_STRING(repr)[1]; *p = '\0'; - if (_PyString_Resize(&repr, p - PyString_AS_STRING(repr))) - goto onError; - + _PyString_Resize(&repr, p - PyString_AS_STRING(repr)); return repr; - - onError: - Py_DECREF(repr); - return NULL; } PyObject *PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s, @@ -1985,14 +1976,8 @@ PyObject *PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s, *p++ = (char) ch; } *p = '\0'; - if (_PyString_Resize(&repr, p - q)) - goto onError; - + _PyString_Resize(&repr, p - q); return repr; - - onError: - Py_DECREF(repr); - return NULL; } PyObject *PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode) @@ -2092,8 +2077,7 @@ PyObject *PyUnicode_EncodeLatin1(const Py_UNICODE *p, } /* Resize if error handling skipped some characters */ if (s - start < PyString_GET_SIZE(repr)) - if (_PyString_Resize(&repr, s - start)) - goto onError; + _PyString_Resize(&repr, s - start); return repr; onError: @@ -2240,8 +2224,7 @@ PyObject *PyUnicode_EncodeASCII(const Py_UNICODE *p, } /* Resize if error handling skipped some characters */ if (s - start < PyString_GET_SIZE(repr)) - if (_PyString_Resize(&repr, s - start)) - goto onError; + _PyString_Resize(&repr, s - start); return repr; onError: @@ -2588,12 +2571,11 @@ PyObject *PyUnicode_EncodeCharmap(const Py_UNICODE *p, Py_DECREF(x); } if (s - PyString_AS_STRING(v) < PyString_GET_SIZE(v)) - if (_PyString_Resize(&v, (int)(s - PyString_AS_STRING(v)))) - goto onError; + _PyString_Resize(&v, (int)(s - PyString_AS_STRING(v))); return v; onError: - Py_DECREF(v); + Py_XDECREF(v); return NULL; } |