From 5fe9706b823cd441703239ece020e517d722d88c Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Sun, 15 May 2016 15:43:47 +0200 Subject: lib: cleanup file descriptors for shared memory cleanup of file descriptors for the shared memory. also adds a missing NULL check and some invalidation in dev.c --- src/lib/dev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/lib/dev.c') diff --git a/src/lib/dev.c b/src/lib/dev.c index 4b5e56be..55e4dc17 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -249,6 +249,9 @@ int flow_accept(int fd, irm_msg_t * recv_msg = NULL; int cfd = -1; + if (ap_name == NULL) + return -1; + msg.code = IRM_MSG_CODE__IRM_FLOW_ACCEPT; msg.has_pid = true; @@ -466,11 +469,13 @@ int flow_dealloc(int fd) msg.code = IRM_MSG_CODE__IRM_FLOW_DEALLOC; msg.has_port_id = true; - rw_lock_rdlock(&_ap_instance->flows_lock); + rw_lock_wrlock(&_ap_instance->flows_lock); msg.port_id = _ap_instance->flows[fd].port_id; - rw_lock_unlock(&_ap_instance->flows_lock); + _ap_instance->flows[fd].port_id = -1; + shm_ap_rbuff_close(_ap_instance->flows[fd].rb); + _ap_instance->flows[fd].rb = NULL; rw_lock_wrlock(&_ap_instance->data_lock); @@ -478,6 +483,8 @@ int flow_dealloc(int fd) rw_lock_unlock(&_ap_instance->data_lock); + rw_lock_unlock(&_ap_instance->flows_lock); + recv_msg = send_recv_irm_msg(&msg); if (recv_msg == NULL) return -1; -- cgit v1.2.3