lib: Fix cleanup for sending messages

Cleanup handlers were not always popped.

2 files changed, 8 insertions, 35 deletions

diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c
index 76098691..141db43d 100644
--- a/src/lib/ipcp.c
+++ b/src/lib/ipcp.c
@@ -81,25 +81,11 @@ static ipcp_msg_t * send_recv_ipcp_msg(pid_t api,
 
        ipcp_msg__pack(msg, buf.data);
 
-       if (write(sockfd, buf.data, buf.len) == -1) {
-               free(buf.data);
-               close(sockfd);
-               return NULL;
-       }
-
-       count = read(sockfd, buf.data, IPCP_MSG_BUF_SIZE);
-       if (count <= 0) {
-               free(buf.data);
-               close(sockfd);
-               return NULL;
-       }
+       if (write(sockfd, buf.data, buf.len) != -1)
+               count = read(sockfd, buf.data, IPCP_MSG_BUF_SIZE);
 
-       recv_msg = ipcp_msg__unpack(NULL, count, buf.data);
-       if (recv_msg == NULL) {
-               free(buf.data);
-               close(sockfd);
-               return NULL;
-       }
+       if (count > 0)
+               recv_msg = ipcp_msg__unpack(NULL, count, buf.data);
 
        pthread_cleanup_pop(true);
        pthread_cleanup_pop(true);
diff --git a/src/lib/sockets.c b/src/lib/sockets.c
index 5d861cdf..0d93c0a9 100644
--- a/src/lib/sockets.c
+++ b/src/lib/sockets.c
@@ -134,25 +134,12 @@ irm_msg_t * send_recv_irm_msg(irm_msg_t * msg)
 
         irm_msg__pack(msg, buf.data);
 
-        if (write(sockfd, buf.data, buf.len) == -1) {
-                free(buf.data);
-                close(sockfd);
-                return NULL;
-        }
+        if (write(sockfd, buf.data, buf.len) != -1)
+                count = read(sockfd, buf.data, IRM_MSG_BUF_SIZE);
 
-        count = read(sockfd, buf.data, IRM_MSG_BUF_SIZE);
-        if (count <= 0) {
-                free(buf.data);
-                close(sockfd);
-                return NULL;
-        }
 
-        recv_msg = irm_msg__unpack(NULL, count, buf.data);
-        if (recv_msg == NULL) {
-                free(buf.data);
-                close(sockfd);
-                return NULL;
-        }
+        if (count > 0)
+                recv_msg = irm_msg__unpack(NULL, count, buf.data);
 
         pthread_cleanup_pop(true);
         pthread_cleanup_pop(true);