fix thread leak, gota detach

2 files changed, 7 insertions, 2 deletions

diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c
index 92de0b99..6b965ecd 100644
--- a/xrdp/xrdp_listen.c
+++ b/xrdp/xrdp_listen.c
@@ -139,7 +139,8 @@ int xrdp_listen_main_loop(struct xrdp_listen* self)
   self->status = 1;
   self->sck = g_tcp_socket();
   g_tcp_set_non_blocking(self->sck);
-  if (g_tcp_bind(self->sck, "3389") != 0)
+  error = g_tcp_bind(self->sck, "3389");
+  if (error != 0)
   {
     g_printf("bind error in xrdp_listen_main_loop\n\r");
     g_tcp_close(self->sck);
@@ -178,7 +179,7 @@ int xrdp_listen_main_loop(struct xrdp_listen* self)
   }
   else
   {
-    DEBUG(("error, listener done\n\r"));
+    DEBUG(("listen error in xrdp_listen_main_loop\n\r"));
   }
   xrdp_listen_term_processes(self);
   g_tcp_close(self->sck);
diff --git a/xrdp/xrdp_orders.c b/xrdp/xrdp_orders.c
index 688c211f..7b5e1273 100644
--- a/xrdp/xrdp_orders.c
+++ b/xrdp/xrdp_orders.c
@@ -39,6 +39,10 @@ struct xrdp_orders* xrdp_orders_create(struct xrdp_process* owner,
 /*****************************************************************************/
 void xrdp_orders_delete(struct xrdp_orders* self)
 {
+  if (self == 0)
+  {
+    return;
+  }
   free_stream(self->out_s);
   g_free(self);
 }