From: Michael Terry <michael.terry@canonical.com>
Date: Wed, 8 Jun 2016 18:10:27 +0000 (-0400)
Subject: Be more careful about initialized fds
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/067e8960d2f617852a95c01909c2772ae4baef1d

Be more careful about initialized fds
---

diff --git a/src/greeter-session.c b/src/greeter-session.c
index 0241dbdf..a7adbaca 100644
--- a/src/greeter-session.c
+++ b/src/greeter-session.c
@@ -20,10 +20,6 @@ struct GreeterSessionPrivate
 {
     /* Greeter running inside this session */
     Greeter *greeter;
-
-    /* Communication channels to communicate with */
-    int to_greeter_input;
-    int from_greeter_output;
 };
 
 G_DEFINE_TYPE (GreeterSession, greeter_session, SESSION_TYPE);
@@ -88,8 +84,6 @@ greeter_session_finalize (GObject *object)
     GreeterSession *self = GREETER_SESSION (object);
 
     g_clear_object (&self->priv->greeter);
-    close (self->priv->to_greeter_input);
-    close (self->priv->from_greeter_output);
 
     G_OBJECT_CLASS (greeter_session_parent_class)->finalize (object);
 }
diff --git a/src/unity-system-compositor.c b/src/unity-system-compositor.c
index 82f31454..9991257d 100644
--- a/src/unity-system-compositor.c
+++ b/src/unity-system-compositor.c
@@ -435,9 +435,9 @@ unity_system_compositor_start (DisplayServer *server)
 
     /* Close compostor ends of the pipes */
     close (compositor->priv->to_compositor_pipe[0]);
-    compositor->priv->to_compositor_pipe[0] = 0;
+    compositor->priv->to_compositor_pipe[0] = -1;
     close (compositor->priv->from_compositor_pipe[1]);
-    compositor->priv->from_compositor_pipe[1] = 0;
+    compositor->priv->from_compositor_pipe[1] = -1;
 
     if (!result)
         return FALSE;
@@ -466,6 +466,10 @@ unity_system_compositor_init (UnitySystemCompositor *compositor)
     compositor->priv->command = g_strdup ("unity-system-compositor");
     compositor->priv->socket = g_strdup ("/run/mir_socket");
     compositor->priv->timeout = -1;
+    compositor->priv->to_compositor_pipe[0] = -1;
+    compositor->priv->to_compositor_pipe[1] = -1;
+    compositor->priv->from_compositor_pipe[0] = -1;
+    compositor->priv->from_compositor_pipe[1] = -1;
 }
 
 static void