Attachment 38280 Details for Bug 29881 – Check return value of XGetWindowProperty in x11_get_address

[patch] Check return value of XGetWindowProperty in x11_get_address

0002-Check-return-value-of-XGetWindowProperty-in-x11_get_a.diff (text/plain), 2.18 KB, created by Kristian Rietveld on 2010-08-30 03:43:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Rietveld

Created: 2010-08-30 03:43:33 UTC

Size: 2.18 KB

patch

obsolete

>>From 17162a69551c83875d4af937b4e7977c461b73dd Mon Sep 17 00:00:00 2001
>From: Christian Dywan <christian.dywan@lanedo.com>
>Date: Mon, 19 Jul 2010 11:48:06 +0200
>Subject: Check return value of XGetWindowProperty in x11_get_address
>
>---
> tools/dbus-launch-x11.c |   17 +++++++++--------
> 1 files changed, 9 insertions(+), 8 deletions(-)
>
>diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c
>index fe49222..0d37134 100644
>--- a/tools/dbus-launch-x11.c
>+++ b/tools/dbus-launch-x11.c
>@@ -293,6 +293,7 @@ init_x_atoms (Display *display)
> int
> x11_get_address (char **paddress, pid_t *pid, long *wid)
> {
>+  int result;
>   Atom type;
>   Window owner;
>   int format;
>@@ -310,10 +311,10 @@ x11_get_address (char **paddress, pid_t *pid, long *wid)
>     *wid = (long) owner;
> 
>   /* get the bus address */
>-  XGetWindowProperty (xdisplay, owner, address_atom, 0, 1024, False,
>-                      XA_STRING, &type, &format, &items, &after,
>-                      (unsigned char **) &data);
>-  if (type == None || after != 0 || data == NULL || format != 8)
>+  result = XGetWindowProperty (xdisplay, owner, address_atom, 0, 1024, False,
>+                              XA_STRING, &type, &format, &items, &after,
>+                              (unsigned char **) &data);
>+  if (result != Success || type == None || after != 0 || data == NULL || format != 8)
>     return FALSE;               /* error */
> 
>   *paddress = xstrdup (data);
>@@ -323,10 +324,10 @@ x11_get_address (char **paddress, pid_t *pid, long *wid)
>   if (pid != NULL)
>     {
>       *pid = 0;
>-      XGetWindowProperty (xdisplay, owner, pid_atom, 0, sizeof pid, False,
>-                          XA_CARDINAL, &type, &format, &items, &after,
>-                          (unsigned char **) &data);
>-      if (type != None && after == 0 && data != NULL && format == 32)
>+      result = XGetWindowProperty (xdisplay, owner, pid_atom, 0, sizeof pid, False,
>+                                   XA_CARDINAL, &type, &format, &items, &after,
>+                                   (unsigned char **) &data);
>+      if (result == Success && type != None && after == 0 && data != NULL && format == 32)
>         *pid = (pid_t) *(long*) data;
>       XFree (data);
>     }
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 29881: 38279 | 38280 | 38281 | 38282 | 38840 | 38841 | 38906 | 38907 | 38908 | 39582 | 42166 | 42167 | 42904

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.