summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2005-12-18 08:02:38 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2005-12-18 08:02:38 (GMT)
commit7c460740ede2b14d5b4792e6c2bccc6d53cf0206 (patch)
tree0c56bfe2cc774a29c29681a1c66a27af0fe4d265
parent51abbc7b4affeeedb8faf1adee8195be9ad8195f (diff)
downloadcpython-7c460740ede2b14d5b4792e6c2bccc6d53cf0206.zip
cpython-7c460740ede2b14d5b4792e6c2bccc6d53cf0206.tar.gz
cpython-7c460740ede2b14d5b4792e6c2bccc6d53cf0206.tar.bz2
Check return result for error
-rw-r--r--Objects/bufferobject.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index da8d9fc..56748e6 100644
--- a/Objects/bufferobject.c
+++ b/Objects/bufferobject.c
@@ -356,6 +356,8 @@ buffer_concat(PyBufferObject *self, PyObject *other)
return NULL;
ob = PyString_FromStringAndSize(NULL, size + count);
+ if ( ob == NULL )
+ return NULL;
p = PyString_AS_STRING(ob);
memcpy(p, ptr1, size);
memcpy(p + size, ptr2, count);