Hi,
In this revision comments are improved to be more consitent and more
focused on the bug fixed. Todo note is removed since there is already
similar fixme note in pbap_setpath function.
BR,
Dmitriy
Hi Dmitriy,
On Thu, Oct 28, 2010, Dmitriy Paliy wrote:
> This fixes obexd crash in 3-way calling scenario when filtered listing
> response is empty. Valid cache and empty pbap buffer mean that cache was
> already attempted to be created within a single session, but no data was
> available. Hence, it is not notified and no such file error returned.
>
> Such avoids clearing and creating a new cache operations for each incoming
> call, which is one of possible solution to fix this bug. It can be
> extensive for large phone books. New cache is not created within current
> obex session or unless path is changed.
> ---
> plugins/pbap.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Pushed upstream. Thanks.
Johan
This fixes obexd crash in 3-way calling scenario when filtered listing
response is empty. Valid cache and empty pbap buffer mean that cache was
already attempted to be created within a single session, but no data was
available. Hence, it is not notified and no such file error returned.
Such avoids clearing and creating a new cache operations for each incoming
call, which is one of possible solution to fix this bug. It can be
extensive for large phone books. New cache is not created within current
obex session or unless path is changed.
---
plugins/pbap.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/plugins/pbap.c b/plugins/pbap.c
index 11cb678..3ea7d6b 100644
--- a/plugins/pbap.c
+++ b/plugins/pbap.c
@@ -751,6 +751,15 @@ static void *vobject_list_open(const char *name, int oflag, mode_t mode,
/* PullvCardListing always get the contacts from the cache */
if (pbap->cache.valid) {
+ /*
+ * Valid cache and empty buffer mean that cache was already
+ * created within a single session, but no data is available.
+ */
+ if (!pbap->buffer) {
+ ret = -ENOENT;
+ goto fail;
+ }
+
cache_ready_notify(pbap);
goto done;
}
--
1.7.0.4