From 63efd107d110387d0217ce303d4e7e1f28f4854c Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 6 Jul 2010 10:37:20 +0300 Subject: [PATCH] obexd: fix use of uninitialized variable for object size By default it is now assigned to OBJECT_SIZE_UNKNOWN so the plugins are only necessary to change its size if they really know the size of object. --- obexd/plugins/filesystem.c | 3 --- obexd/plugins/pbap.c | 9 --------- obexd/src/obex.c | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c index ffed561f5..9fe4f006e 100644 --- a/obexd/plugins/filesystem.c +++ b/obexd/plugins/filesystem.c @@ -323,9 +323,6 @@ static void *capability_open(const char *name, int oflag, mode_t mode, object->watch = g_child_watch_add(object->pid, script_exited, object); - if (size) - *size = 1; - done: if (err) *err = 0; diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c index b598c68bd..3c8e33e73 100644 --- a/obexd/plugins/pbap.c +++ b/obexd/plugins/pbap.c @@ -698,9 +698,6 @@ static void *vobject_pull_open(const char *name, int oflag, mode_t mode, if (ret < 0) goto fail; - if (size) - *size = OBJECT_SIZE_UNKNOWN; - return pbap; fail: @@ -737,9 +734,6 @@ static void *vobject_list_open(const char *name, int oflag, mode_t mode, goto fail; done: - if (size) - *size = OBJECT_SIZE_UNKNOWN; - return pbap; fail: @@ -789,9 +783,6 @@ done: if (ret < 0) goto fail; - if (size) - *size = OBJECT_SIZE_UNKNOWN; - return pbap; fail: diff --git a/obexd/src/obex.c b/obexd/src/obex.c index 9622712de..53474ec4e 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -729,7 +729,7 @@ int obex_get_stream_start(struct obex_session *os, const char *filename) { int err; void *object; - size_t size; + size_t size = OBJECT_SIZE_UNKNOWN; object = os->driver->open(filename, O_RDONLY, 0, os->service_data, &size, &err); -- 2.47.3