From 9d47becf251d8601e834e777d6f7f10eb62ec8dc Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 5 Jun 2010 14:55:53 +0200
Subject: [PATCH] Add missing malloc failure checks

Also add errno = ENOMEM because it is said that that some malloc
implementations might miss to do so.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 src/fw-iso.c |  4 +++-
 src/fw.c     | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/fw-iso.c b/src/fw-iso.c
index 88909dc..5aac9fe 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
@@ -463,8 +463,10 @@ iso_init(fw_handle_t handle, int type,
 	handle->iso.packet_count = 0;
 	handle->iso.packets =
 		malloc(handle->iso.irq_interval * sizeof handle->iso.packets[0]);
-	if (handle->iso.packets == NULL)
+	if (handle->iso.packets == NULL) {
+		errno = ENOMEM;
 		return -1;
+	}
 
 	handle->iso.fd = open(handle->iso.filename, O_RDWR);
 	if (handle->iso.fd < 0) {
diff --git a/src/fw.c b/src/fw.c
index d525ac9..f92c1b6 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -419,9 +419,13 @@ fw_handle_t fw_new_handle(void)
 	struct epoll_event ep;
 	int i;
 
-	memset(&ep, 0, sizeof(ep));
-
 	handle = malloc(sizeof *handle);
+	if (handle == NULL) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	memset(&ep, 0, sizeof(ep));
 	memset(handle, 0, sizeof(*handle));
 
 	handle->tag_handler = default_tag_handler;
@@ -775,6 +779,10 @@ handle_arm_request(raw1394handle_t handle, struct address_closure *ac,
 		return 0;
 
 	rrb = malloc(sizeof *rrb + in_length + response.length);
+	if (rrb == NULL) {
+		errno == ENOMEM;
+		return -1;
+	}
 
 	rrb->request_response.request = &rrb->request;
 	rrb->request_response.response = &rrb->response;
@@ -818,8 +826,10 @@ fw_arm_register(fw_handle_t handle, nodeaddr_t start,
 	int retval;
 
 	allocation = malloc(sizeof *allocation + length);
-	if (allocation == NULL)
+	if (allocation == NULL) {
+		errno = ENOMEM;
 		return -1;
+	}
 
 	allocation->closure.callback = handle_arm_request;
 	allocation->buffer = initial_value;
@@ -1318,8 +1328,10 @@ fw_start_fcp_listen(fw_handle_t handle)
 	struct address_closure *closure;
 
 	closure = malloc(sizeof *closure);
-	if (closure == NULL)
+	if (closure == NULL) {
+		errno = ENOMEM;
 		return -1;
+	}
 
 	closure->callback = handle_fcp_request;