PolicyKit: Branch 'master'

[David Zeuthen]

 src/polkitagent/polkitagentsession.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 4aa6dd28476e12a5265d71b6bc19c730f1036785
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Mar 8 15:36:30 2012 -0500

    PolkitAgentSession: Don't leak file descriptors
    
    This was reported here
    
     https://bugzilla.gnome.org/show_bug.cgi?id=671486
    
    Signed-off-by: David Zeuthen <davidz at redhat.com>

diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c
index ad3bbc3..8129cd9 100644
--- a/src/polkitagent/polkitagentsession.c
+++ b/src/polkitagent/polkitagentsession.c
@@ -130,6 +130,8 @@ G_DEFINE_TYPE (PolkitAgentSession, polkit_agent_session, G_TYPE_OBJECT);
 static void
 polkit_agent_session_init (PolkitAgentSession *session)
 {
+  session->child_stdin = -1;
+  session->child_stdout = -1;
 }
 
 static void kill_helper (PolkitAgentSession *session);
@@ -395,6 +397,18 @@ kill_helper (PolkitAgentSession *session)
       session->child_stdout_channel = NULL;
     }
 
+  if (session->child_stdout != -1)
+    {
+      g_warn_if_fail (close (session->child_stdout) == 0);
+      session->child_stdout = -1;
+    }
+
+  if (session->child_stdin != -1)
+    {
+      g_warn_if_fail (close (session->child_stdin) == 0);
+      session->child_stdin = -1;
+    }
+
   session->helper_is_running = FALSE;
 
  out: