Attachment 106930 Details for Bug 83539 – Exec fix

[patch] Exec fix

dbus.patch (text/plain), 1.03 KB, created by Milan Crha on 2014-09-26 17:47:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-09-26 17:47:09 UTC

Size: 1.03 KB

patch

obsolete

>diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' dbus-1.8.0.old/dbus/dbus-sysdeps-util-win.c dbus-1.8.0/dbus/dbus-sysdeps-util-win.c
>--- dbus-1.8.0.old/dbus/dbus-sysdeps-util-win.c	2014-09-26 17:35:03 +0000
>+++ dbus-1.8.0/dbus/dbus-sysdeps-util-win.c	2014-09-05 22:19:40 +0000
>@@ -1555,13 +1555,12 @@ _dbus_replace_install_prefix (const char
>   if ((!_dbus_get_install_root(runtime_prefix, len) ||
>        strncmp (configure_time_path, DBUS_PREFIX "/",
>                 strlen (DBUS_PREFIX) + 1))) {
>-     strcat (retval, configure_time_path);
>-     return retval;
>+     strcpy (retval, configure_time_path);
>+  } else {
>+     strcpy (retval, runtime_prefix);
>+     strcat (retval, configure_time_path + strlen (DBUS_PREFIX) + 1);
>   }
> 
>-  strcpy (retval, runtime_prefix);
>-  strcat (retval, configure_time_path + strlen (DBUS_PREFIX) + 1);
>-
>   /* Somehow, in some situations, backslashes get collapsed in the string.
>    * Since windows C library accepts both forward and backslashes as
>    * path separators, convert all backslashes to forward slashes.

Actions: View | Splinter Review

Attachments on bug 83539: 105816 | 106930 | 106931 | 113363 | 113364 | 113377 | 118346 | 118349 | 118350 | 118540 | 118617 | 118618 | 118652

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.