OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5051aac
)
gdbus: Escape nonce files in dbus addressess
author
Alexander Larsson
<alexl@redhat.com>
Tue, 17 Apr 2012 13:50:53 +0000
(15:50 +0200)
committer
Alexander Larsson
<alexl@redhat.com>
Fri, 20 Apr 2012 14:31:41 +0000
(16:31 +0200)
Otherwise the colon in c:\blah made for trouble
(cherry picked from commit
82aecce30131e275dff73f23ee91e7c40a9b3f03
)
gio/gdbusserver.c
patch
|
blob
|
history
diff --git
a/gio/gdbusserver.c
b/gio/gdbusserver.c
index
5e7dd85
..
e132b70
100644
(file)
--- a/
gio/gdbusserver.c
+++ b/
gio/gdbusserver.c
@@
-843,6
+843,7
@@
try_tcp (GDBusServer *server,
guint n;
gsize bytes_written;
gsize bytes_remaining;
+ char *file_escaped;
server->nonce = g_new0 (guchar, 16);
for (n = 0; n < 16; n++)
@@
-878,10
+879,12
@@
try_tcp (GDBusServer *server,
bytes_remaining -= ret;
}
close (fd);
+ file_escaped = g_uri_escape_string (server->nonce_file, "/\\", FALSE);
server->client_address = g_strdup_printf ("nonce-tcp:host=%s,port=%d,noncefile=%s",
host,
port_num,
- server->nonce_file);
+ file_escaped);
+ g_free (file_escaped);
}
else
{