[Patch #102827] Fix for PR#119558, avoiding core dumps by checking for
malloc() returning NULL
diff --git a/Modules/bsddbmodule.c b/Modules/bsddbmodule.c
index 24d859b..35a22b9 100644
--- a/Modules/bsddbmodule.c
+++ b/Modules/bsddbmodule.c
@@ -266,9 +266,10 @@
if (status == 0) {
if (drec.size > sizeof(buf)) data = malloc(drec.size);
else data = buf;
- memcpy(data,drec.data,drec.size);
+ if (data!=NULL) memcpy(data,drec.data,drec.size);
}
BSDDB_END_SAVE(dp)
+ if (data==NULL) return PyErr_NoMemory();
if (status != 0) {
if (status < 0)
PyErr_SetFromErrno(BsddbError);
@@ -387,9 +388,10 @@
if (status == 0) {
if (krec.size > sizeof(buf)) data = malloc(krec.size);
else data = buf;
- memcpy(data,krec.data,krec.size);
+ if (data!=NULL) memcpy(data,krec.data,krec.size);
}
BSDDB_END_SAVE(dp)
+ if (data==NULL) return PyErr_NoMemory();
while (status == 0) {
item = PyString_FromStringAndSize(data, (int)krec.size);
if (data != buf) free(data);
@@ -408,9 +410,10 @@
if (status == 0) {
if (krec.size > sizeof(buf)) data = malloc(krec.size);
else data = buf;
- memcpy(data,krec.data,krec.size);
+ if (data!=NULL) memcpy(data,krec.data,krec.size);
}
BSDDB_END_SAVE(dp)
+ if (data==NULL) return PyErr_NoMemory();
}
if (status < 0) {
PyErr_SetFromErrno(BsddbError);
@@ -467,9 +470,10 @@
if (status == 0) {
if (drec.size > sizeof(buf)) data = malloc(drec.size);
else data = buf;
- memcpy(data,drec.data,drec.size);
+ if (data!=NULL) memcpy(data,drec.data,drec.size);
}
BSDDB_END_SAVE(dp)
+ if (data==NULL) return PyErr_NoMemory();
if (status != 0) {
if (status < 0)
PyErr_SetFromErrno(BsddbError);
@@ -505,13 +509,18 @@
if (status == 0) {
if (krec.size > sizeof(kbuf)) kdata = malloc(krec.size);
else kdata = kbuf;
- memcpy(kdata,krec.data,krec.size);
+ if (kdata!=NULL) memcpy(kdata,krec.data,krec.size);
if (drec.size > sizeof(dbuf)) ddata = malloc(drec.size);
else ddata = dbuf;
- memcpy(ddata,drec.data,drec.size);
+ if (ddata!=NULL) memcpy(ddata,drec.data,drec.size);
}
BSDDB_END_SAVE(dp)
- if (status != 0) {
+ if (status == 0) {
+ if ((kdata==NULL) || (ddata==NULL))
+ return PyErr_NoMemory();
+ }
+ else {
+ /* (status != 0) */
if (status < 0)
PyErr_SetFromErrno(BsddbError);
else