From 454fb0bb71710cdcdd9917738aa785465da5cb31 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 23 Mar 2013 20:50:18 +0100 Subject: ipc: Set ipc message structure to 0 and double check before freeing Signed-off-by: Paul Kocialkowski --- ipc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ipc.c b/ipc.c index 4c4a244..6d3138a 100644 --- a/ipc.c +++ b/ipc.c @@ -83,6 +83,8 @@ int ipc_fmt_read_loop(struct ril_client *client) FD_SET(ipc_client_fd, &fds); while (1) { + memset(&info, 0, sizeof(info)); + if (ipc_client_fd < 0) { LOGE("IPC FMT client fd is negative, aborting!"); return -1; @@ -101,7 +103,7 @@ int ipc_fmt_read_loop(struct ril_client *client) ipc_fmt_dispatch(&info); - if (info.data != NULL) + if (info.data != NULL && info.length > 0) free(info.data); } } -- cgit v1.1