From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 29 Aug 2013 11:50:16 +0000 (+0100)
Subject: _dbus_get_autolaunch_address: don't make argv static
X-Git-Tag: dbus-1.7.6~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e63961b75053d744bd06ce926df0b8a31c30fa77;p=thirdparty%2Fdbus.git

_dbus_get_autolaunch_address: don't make argv static

This function could be accessed from any thread, which would mean it
scribbles on argv twice.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 1dcb6f862..13e13ca13 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -3463,7 +3463,7 @@ _dbus_get_autolaunch_address (const char *scope,
    * but that's done elsewhere, and if it worked, this function wouldn't
    * be called.) */
   const char *display;
-  static char *argv[6];
+  char *argv[6];
   int i;
   DBusString uuid;
   dbus_bool_t retval;