2012-02-02 11:33:35

by Jaganath Kanakkassery

Subject: [PATCH obexd 2/4] gobex: Fix ABORT request not processing

G_OBEX_OP_ABORT is defined as 0x7f but error checking of opcode is
done for greater than 0x1f. So abort request is simply ignored.
---
gobex/gobex.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gobex/gobex.c b/gobex/gobex.c
index 0853a9b..c1e7dc4 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -1163,7 +1163,7 @@ static gboolean incoming_data(GIOChannel *io, GIOCondition cond,
} else {
opcode = obex->rx_last_op;
/* Unexpected response -- fail silently */
- if (opcode > 0x1f && opcode < 0xff) {
+ if (opcode > 0x1f && opcode != G_OBEX_OP_ABORT) {
obex->rx_data = 0;
return TRUE;
}
--
1.7.1

2012-02-02 17:16:41

by Luiz Augusto von Dentz

Subject: Re: [PATCH obexd 2/4] gobex: Fix ABORT request not processing

Hi Jaganath,

On Thu, Feb 2, 2012 at 3:33 AM, Jaganath Kanakkassery
<[email protected]> wrote:
> G_OBEX_OP_ABORT is defined as 0x7f but error checking of opcode is
> done for greater than 0x1f. So abort request is simply ignored.
> ---
> ?gobex/gobex.c | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/gobex/gobex.c b/gobex/gobex.c
> index 0853a9b..c1e7dc4 100644
> --- a/gobex/gobex.c
> +++ b/gobex/gobex.c
> @@ -1163,7 +1163,7 @@ static gboolean incoming_data(GIOChannel *io, GIOCondition cond,
> ? ? ? ?} else {
> ? ? ? ? ? ? ? ?opcode = obex->rx_last_op;
> ? ? ? ? ? ? ? ?/* Unexpected response -- fail silently */
> - ? ? ? ? ? ? ? if (opcode > 0x1f && opcode < 0xff) {
> + ? ? ? ? ? ? ? if (opcode > 0x1f && opcode != G_OBEX_OP_ABORT) {
> ? ? ? ? ? ? ? ? ? ? ? ?obex->rx_data = 0;
> ? ? ? ? ? ? ? ? ? ? ? ?return TRUE;
> ? ? ? ? ? ? ? ?}
> --
> 1.7.1

Ack

--
Luiz Augusto von Dentz