summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-01-11 23:40:09 -0800
committerGitHub <noreply@github.com>2019-01-11 23:40:09 -0800
commitd39c19255910b9dce08c595f511597e98b09e91f (patch)
tree143d8ea12e92c3fb56e8864d08381d42a4e72f9f /Objects
parent059997d78ed1a1a5a364b1846ac972c98c704927 (diff)
downloadcpython-git-d39c19255910b9dce08c595f511597e98b09e91f.tar.gz
bpo-33817: Fix _PyBytes_Resize() for empty bytes object. (GH-11516)
Add also tests for PyUnicode_FromFormat() and PyBytes_FromFormat() with empty result. (cherry picked from commit 44cc4822bb3799858201e61294c5863f93ec12e2) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 711faba645..5f9e1eccf2 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2990,9 +2990,22 @@ _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
/* return early if newsize equals to v->ob_size */
return 0;
}
+ if (Py_SIZE(v) == 0) {
+ if (newsize == 0) {
+ return 0;
+ }
+ *pv = _PyBytes_FromSize(newsize, 0);
+ Py_DECREF(v);
+ return (*pv == NULL) ? -1 : 0;
+ }
if (Py_REFCNT(v) != 1) {
goto error;
}
+ if (newsize == 0) {
+ *pv = _PyBytes_FromSize(0, 0);
+ Py_DECREF(v);
+ return (*pv == NULL) ? -1 : 0;
+ }
/* XXX UNREF/NEWREF interface should be more symmetrical */
_Py_DEC_REFTOTAL;
_Py_ForgetReference(v);