From: Luiz Augusto von Dentz <[email protected]>
Both hdr and size need to be updated otherwise no parameters will be
parsed.
---
client/pbap.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/client/pbap.c b/client/pbap.c
index 9e9eb05..84465ac 100644
--- a/client/pbap.c
+++ b/client/pbap.c
@@ -364,8 +364,8 @@ static void read_return_apparam(struct obc_session *session,
{
struct obc_transfer *transfer = obc_session_get_transfer(session);
struct obc_transfer_params params;
- unsigned char *buf;
- size_t size = 0;
+ struct apparam_hdr *hdr;
+ size_t size;
*phone_book_size = 0;
*new_missed_calls = 0;
@@ -376,9 +376,10 @@ static void read_return_apparam(struct obc_session *session,
if (params.size < APPARAM_HDR_SIZE)
return;
- while (size > APPARAM_HDR_SIZE) {
- struct apparam_hdr *hdr = (struct apparam_hdr *) params.data;
+ hdr = (struct apparam_hdr *) params.data;
+ size = params.size;
+ while (size > APPARAM_HDR_SIZE) {
if (hdr->len > size - APPARAM_HDR_SIZE) {
error("Unexpected PBAP pullphonebook app"
" length, tag %d, len %d",
@@ -404,7 +405,7 @@ static void read_return_apparam(struct obc_session *session,
hdr->tag, hdr->len);
}
- buf += APPARAM_HDR_SIZE + hdr->len;
+ hdr += APPARAM_HDR_SIZE + hdr->len;
size -= APPARAM_HDR_SIZE + hdr->len;
}
}
--
1.7.7.5
Hi Syam,
On Mon, Jan 16, 2012 at 4:52 PM, Syam Sidhardhan <[email protected]> wrote:
> Here one more changes is required. Since we are not updating the size
> while (size > APPARAM_HDR_SIZE) statement will always evaluate as false
> and it will never enter into the loop. So we need to have a statement
> size = params.size; before checking for the while() condition. Correct me if
> I 'm wrong here.
Yep, gonna fix that too, thanks for the feedback.
--
Luiz Augusto von Dentz
Hi Luiz,
----- Original Message -----
From: "Luiz Augusto von Dentz" <[email protected]>
To: <[email protected]>
Sent: Saturday, January 14, 2012 3:23 PM
Subject: [PATCH obexd] client: fix parsing of apparam on pbap driver
> From: Luiz Augusto von Dentz <[email protected]>
>
> Header pointer need to be updated otherwise the code will be stuck in the
> first parameter even though the size is updated.
> ---
> client/pbap.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/client/pbap.c b/client/pbap.c
> index 9e9eb05..1da0ae5 100644
> --- a/client/pbap.c
> +++ b/client/pbap.c
> @@ -364,7 +364,7 @@ static void read_return_apparam(struct obc_session
> *session,
> {
> struct obc_transfer *transfer = obc_session_get_transfer(session);
> struct obc_transfer_params params;
> - unsigned char *buf;
> + struct apparam_hdr *hdr;
> size_t size = 0;
>
> *phone_book_size = 0;
> @@ -376,9 +376,9 @@ static void read_return_apparam(struct obc_session
> *session,
> if (params.size < APPARAM_HDR_SIZE)
> return;
>
> - while (size > APPARAM_HDR_SIZE) {
> - struct apparam_hdr *hdr = (struct apparam_hdr *) params.data;
> + hdr = (struct apparam_hdr *) params.data;
>
> + while (size > APPARAM_HDR_SIZE) {
> if (hdr->len > size - APPARAM_HDR_SIZE) {
> error("Unexpected PBAP pullphonebook app"
> " length, tag %d, len %d",
> @@ -404,7 +404,7 @@ static void read_return_apparam(struct obc_session
> *session,
> hdr->tag, hdr->len);
> }
>
> - buf += APPARAM_HDR_SIZE + hdr->len;
> + hdr += APPARAM_HDR_SIZE + hdr->len;
> size -= APPARAM_HDR_SIZE + hdr->len;
> }
> }
Here one more changes is required. Since we are not updating the size
while (size > APPARAM_HDR_SIZE) statement will always evaluate as false
and it will never enter into the loop. So we need to have a statement
size = params.size; before checking for the while() condition. Correct me if
I 'm wrong here.
Thanks,
Syam
> --
> 1.7.7.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth"
> in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html