Patch proposed by Marco to fix bareos-fd and bareos-sd -t segfault

bareos · Mar 6, 2015 · 2817856 · 2817856
1 parent c0b2f27
commit 2817856
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/src/dird/socket_server.c b/src/dird/socket_server.c
@@ -31,9 +31,8 @@
 #include "dird.h"
 
 /* Global variables */
-static int started = FALSE;
 static workq_t socket_workq;
-static alist *sock_fds;
+static alist *sock_fds = NULL;
 static pthread_t tcp_server_tid;
 
 struct s_addr_port {
@@ -117,19 +116,16 @@ void start_socket_server(dlist *addrs)
       berrno be;
       Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.bstrerror(status));
    }
-   started = TRUE;
 
    return;
 }
 
 void stop_socket_server()
 {
-   if (!started) {
-      return;
+   if (sock_fds) {
+      bnet_stop_thread_server_tcp(tcp_server_tid);
+      cleanup_bnet_thread_server_tcp(sock_fds, &socket_workq);
+      delete sock_fds;
+      sock_fds = NULL;
    }
-
-   bnet_stop_thread_server_tcp(tcp_server_tid);
-   cleanup_bnet_thread_server_tcp(sock_fds, &socket_workq);
-   delete sock_fds;
-   sock_fds = NULL;
 }
diff --git a/src/filed/socket_server.c b/src/filed/socket_server.c
@@ -32,8 +32,8 @@
 
 /* Global variables */
 static workq_t socket_workq;
-static alist *sock_fds;
 static pthread_t tcp_server_tid;
+static alist *sock_fds = NULL;
 
 /*
  * Connection request. We accept connections either from the Director or the Storage Daemon
@@ -107,9 +107,10 @@ void start_socket_server(dlist *addrs)
 
 void stop_socket_server()
 {
-   bnet_stop_thread_server_tcp(tcp_server_tid);
-   cleanup_bnet_thread_server_tcp(sock_fds, &socket_workq);
-   delete sock_fds;
-   sock_fds = NULL;
-
+   if (sock_fds) {
+      bnet_stop_thread_server_tcp(tcp_server_tid);
+      cleanup_bnet_thread_server_tcp(sock_fds, &socket_workq);
+      delete sock_fds;
+      sock_fds = NULL;
+   }
 }
diff --git a/src/stored/socket_server.c b/src/stored/socket_server.c
@@ -32,7 +32,7 @@
 
 /* Global variables */
 static workq_t socket_workq;
-static alist *sock_fds;
+static alist *sock_fds = NULL;
 static pthread_t tcp_server_tid;
 
 /*
@@ -123,8 +123,10 @@ void start_socket_server(dlist *addrs)
 
 void stop_socket_server()
 {
-   bnet_stop_thread_server_tcp(tcp_server_tid);
-   cleanup_bnet_thread_server_tcp(sock_fds, &socket_workq);
-   delete sock_fds;
-   sock_fds = NULL;
+   if (sock_fds) {
+      bnet_stop_thread_server_tcp(tcp_server_tid);
+      cleanup_bnet_thread_server_tcp(sock_fds, &socket_workq);
+      delete sock_fds;
+      sock_fds = NULL;
+   }
 }