Attachment 67406 Details for Bug 55067 – Only clean up WIFEXITED

[patch] Only clean up WIFEXITED

0001-util-Clean-up-spawn_with_login_uid-error-handling.patch (text/plain), 3.22 KB, created by Colin Walters on 2012-09-19 16:08:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2012-09-19 16:08:15 UTC

Size: 3.22 KB

patch

obsolete

>From a23bc734cd65f22971fae247cc5bc1ee44e0e7d9 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Tue, 18 Sep 2012 14:58:57 -0400
>Subject: [PATCH] util: Clean up spawn_with_login_uid() error handling
>
>We were only checking WEXITSTATUS(), but this is broken in the case
>where !WIFEXITED(), for example WIFSIGNALED().  If available, use
>g_spawn_check_exit_status() from newer GLib which makes this easy.
>
>Also, use G_N_ELEMENTS() instead of hardcoding the length again.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=55067
>---
> src/util.c | 59 +++++++++++++++++++++++++++++++++++------------------------
> 1 file changed, 35 insertions(+), 24 deletions(-)
>
>diff --git a/src/util.c b/src/util.c
>index 2e363a3..44316b6 100644
>--- a/src/util.c
>+++ b/src/util.c
>@@ -201,6 +201,32 @@ get_caller_loginuid (GDBusMethodInvocation *context, gchar *loginuid, gint size)
>         g_free (path);
> }
> 
>+static gboolean
>+compat_check_exit_status (int      estatus,
>+                          GError **error)
>+{
>+#if GLIB_CHECK_VERSION(2, 33, 12)
>+        return g_spawn_check_exit_status (estatus, error);
>+#else
>+        if (!WIFEXITED (estatus)) {
>+                g_set_error (error,
>+                             G_SPAWN_ERROR,
>+                             G_SPAWN_ERROR_FAILED,
>+                             "Exited abnormally");
>+                return FALSE;
>+        }
>+        if (WEXITSTATUS (estatus) != 0) {
>+                g_set_error (error,
>+                             G_SPAWN_ERROR,
>+                             G_SPAWN_ERROR_FAILED,
>+                             "Exited with code %d",
>+                             WEXITSTATUS(estatus));
>+                return FALSE;
>+        }
>+        return TRUE;
>+#endif
>+}
>+
> static void
> setup_loginuid (gpointer data)
> {
>@@ -217,35 +243,20 @@ spawn_with_login_uid (GDBusMethodInvocation  *context,
>                       const gchar            *argv[],
>                       GError                **error)
> {
>-        GError *local_error;
>+        gboolean ret = FALSE;
>         gchar loginuid[20];
>-        gchar *std_err;
>         gint status;
> 
>-        get_caller_loginuid (context, loginuid, 20);
>-
>-        local_error = NULL;
>-        std_err = NULL;
>+        get_caller_loginuid (context, loginuid, G_N_ELEMENTS (loginuid));
> 
>-        if (!g_spawn_sync (NULL, (gchar**)argv, NULL, 0, setup_loginuid, loginuid, NULL, &std_err, &status, &local_error)) {
>-                g_propagate_error (error, local_error);
>-                g_free (std_err);
>-                return FALSE;
>-        }
>+        if (!g_spawn_sync (NULL, (gchar**)argv, NULL, 0, setup_loginuid, loginuid, NULL, NULL, &status, error))
>+                goto out;
>+        if (!compat_check_exit_status (status, error))
>+                goto out;
> 
>-        if (WEXITSTATUS (status) != 0) {
>-                g_set_error (error,
>-                             G_SPAWN_ERROR,
>-                             G_SPAWN_ERROR_FAILED,
>-                             "%s returned an error (%d): %s",
>-                             argv[0], WEXITSTATUS(status), std_err);
>-                g_free (std_err);
>-                return FALSE;
>-        }
>-
>-        g_free (std_err);
>-
>-        return TRUE;
>+        ret = TRUE;
>+ out:
>+        return ret;
> }
> 
> gint
>-- 
>1.7.11.4
>

Actions: View | Splinter Review

Attachments on bug 55067: 67350 | 67406

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.