diff options
| author | Michal Eljasiewicz <m.eljasiewic@samsung.com> | 2013-12-11 17:45:15 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-02-11 11:55:28 +0100 |
| commit | 2ba7adad45e763a83c7434443c194ec1e4012bb4 (patch) | |
| tree | ec55f2914b6e61513bd087ca38dfd63cc4cd04c6 | |
| parent | f102c4873a6bc9898a90aed774d72c9bce36ce5b (diff) | |
[Daemon-fix][Upstream merge] Small fixes in daemon starting
Signed-off-by: Michal Eljasiewicz <m.eljasiewic@samsung.com>
Change-Id: Id0527a832cbaabda89b7e0f7a328ef0cde03aef5
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | dbus/dbus-transport-kdbus.c | 1 | ||||
| -rw-r--r-- | dbus/kdbus-common.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -102,5 +102,5 @@ fi #--enable-developer --enable-verbose-mode if $run_configure; then - $srcdir/configure --enable-abstract-sockets --config-cache "$@" + $srcdir/configure --enable-abstract-sockets --config-cache --enable-doxygen-docs=no "$@" fi diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c index 27263ea6..b95339ca 100644 --- a/dbus/dbus-transport-kdbus.c +++ b/dbus/dbus-transport-kdbus.c @@ -518,6 +518,7 @@ static int kdbus_write_msg(DBusTransportKdbus *transport, DBusMessage *message, static dbus_bool_t bus_register_kdbus(char* name, DBusTransportKdbus* transportS) { struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello; + memset(&hello, 0, sizeof(hello)); hello.conn_flags = KDBUS_HELLO_ACCEPT_FD/* | KDBUS_HELLO_ATTACH_COMM | diff --git a/dbus/kdbus-common.c b/dbus/kdbus-common.c index 56516968..a55be270 100644 --- a/dbus/kdbus-common.c +++ b/dbus/kdbus-common.c @@ -46,7 +46,7 @@ static struct kdbus_item *make_policy_name(const char *name) memset(p, 0, size); p->size = size; p->type = KDBUS_ITEM_POLICY_NAME; - strcpy(p->policy.name, name); + memcpy(p->policy.name, name, strlen(name) + 1); return p; } |