From 3706cc5d75c2005dda3d1ceaee8f648db5970a25 Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@intec.ugent.be>
Date: Fri, 20 May 2016 20:44:30 +0200
Subject: lib, ipcpd: fixes segfaults in dev.c and shim-udp

---
 src/ipcpd/shim-udp/main.c | 3 +--
 src/lib/dev.c             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 3ef783c4..1284a0e5 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -189,10 +189,9 @@ void shim_ap_fini()
                         shm_ap_rbuff_close(_ap_instance->flows[i].rb);
 
         rw_lock_unlock(&_ap_instance->flows_lock);
+        rw_lock_unlock(&_ipcp->state_lock);
 
         free(_ap_instance);
-
-        rw_lock_unlock(&_ipcp->state_lock);
 }
 
 /* only call this under flows_lock */
diff --git a/src/lib/dev.c b/src/lib/dev.c
index fab37bbf..63cf92f7 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -137,10 +137,9 @@ void ap_fini(void)
                         shm_ap_rbuff_close(_ap_instance->flows[i].rb);
 
         rw_lock_unlock(&_ap_instance->flows_lock);
+        rw_lock_unlock(&_ap_instance->data_lock);
 
         free(_ap_instance);
-
-        rw_lock_unlock(&_ap_instance->data_lock);
 }
 
 #if 0
-- 
cgit v1.2.3