From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 18 Dec 2005 08:02:38 +0000 (+0000)
Subject: Check return result for error
X-Git-Tag: v2.5a0~987
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c460740ede2b14d5b4792e6c2bccc6d53cf0206;p=thirdparty%2FPython%2Fcpython.git

Check return result for error
---

diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index da8d9fc6a257..56748e671e68 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);