From 19598f1d9d953fe775d11b7df35d48b604e01456 Mon Sep 17 00:00:00 2001
From: ly1217 <yu.liu@seafile.com>
Date: Tue, 24 Sep 2019 20:16:38 -0700
Subject: [PATCH] Fix memory leak.

---
 lib/searpc-named-pipe-transport.c | 7 ++-----
 lib/searpc-named-pipe-transport.h | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/searpc-named-pipe-transport.c b/lib/searpc-named-pipe-transport.c
index 59d73ff..1f3ab72 100644
--- a/lib/searpc-named-pipe-transport.c
+++ b/lib/searpc-named-pipe-transport.c
@@ -158,7 +158,6 @@ failed:
 }
 
 typedef struct {
-    SearpcNamedPipeServer *server;
     SearpcNamedPipe connfd;
 } ServerHandlerData;
 
@@ -169,7 +168,6 @@ static void* named_pipe_listen(void *arg)
     while (1) {
         int connfd = accept (server->pipe_fd, NULL, 0);
         ServerHandlerData *data = g_malloc(sizeof(ServerHandlerData));
-        data->server = server;
         data->connfd = connfd;
         g_thread_pool_push (server->named_pipe_server_thread_pool, data, NULL);
     }
@@ -209,7 +207,6 @@ static void* named_pipe_listen(void *arg)
         /* g_debug ("Accepted a named pipe client\n"); */
 
         ServerHandlerData *data = g_malloc(sizeof(ServerHandlerData));
-        data->server = server;
         data->connfd = connfd;
         g_thread_pool_push (server->named_pipe_server_thread_pool, data, NULL);
     }
@@ -220,7 +217,6 @@ static void* named_pipe_listen(void *arg)
 static void named_pipe_client_handler(void *data, void *user_data)
 {
     ServerHandlerData *handler_data = data;
-    // SearpcNamedPipeServer *server = data->server;
     SearpcNamedPipe connfd = handler_data->connfd;
 
     guint32 len;
@@ -248,7 +244,6 @@ static void named_pipe_client_handler(void *data, void *user_data)
 
         if (pipe_read_n(connfd, buf, len) < 0 || len == 0) {
             g_warning("failed to read rpc request: %s\n", strerror(errno));
-            g_free (buf);
             break;
         }
 
@@ -284,6 +279,8 @@ static void named_pipe_client_handler(void *data, void *user_data)
     DisconnectNamedPipe(connfd);
     CloseHandle(connfd);
 #endif // !defined(WIN32)
+    g_free (data);
+    g_free (buf);
 }
 
 
diff --git a/lib/searpc-named-pipe-transport.h b/lib/searpc-named-pipe-transport.h
index 1a4eb34..72c8e22 100644
--- a/lib/searpc-named-pipe-transport.h
+++ b/lib/searpc-named-pipe-transport.h
@@ -30,7 +30,6 @@ typedef int SearpcNamedPipe;
 struct _SearpcNamedPipeServer {
     char path[4096];
     pthread_t listener_thread;
-    GList *handlers;
     SearpcNamedPipe pipe_fd;
     GThreadPool *named_pipe_server_thread_pool;
 };