2014-06-09 08:26:16

by Andrei Emeltchenko

Subject: [RFC] android/gatt: Fix error status override

From: Andrei Emeltchenko <[email protected]>

---
android/gatt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/gatt.c b/android/gatt.c
index 3fd88fa..7cf70a9 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -1950,8 +1950,10 @@ static void handle_client_search_service(const void *buf, uint16_t len)
if (s) {
send_client_primary_notify(s, INT_TO_PTR(conn->id));
} else {
- if (!search_dev_for_srvc(conn, &uuid))
+ if (!search_dev_for_srvc(conn, &uuid)) {
status = HAL_STATUS_FAILED;
+ goto reply;
+ }

status = HAL_STATUS_SUCCESS;
goto reply;
--
1.8.3.2

2014-06-12 09:55:01

by Szymon Janc

Subject: Re: [RFC] android/gatt: Fix error status override

Hi Andrei,

On Monday 09 of June 2014 11:26:16 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> android/gatt.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/android/gatt.c b/android/gatt.c
> index 3fd88fa..7cf70a9 100644
> --- a/android/gatt.c
> +++ b/android/gatt.c
> @@ -1950,8 +1950,10 @@ static void handle_client_search_service(const void *buf, uint16_t len)
> if (s) {
> send_client_primary_notify(s, INT_TO_PTR(conn->id));
> } else {
> - if (!search_dev_for_srvc(conn, &uuid))
> + if (!search_dev_for_srvc(conn, &uuid)) {
> status = HAL_STATUS_FAILED;
> + goto reply;
> + }
>
> status = HAL_STATUS_SUCCESS;
> goto reply;
>

Patch applied, thanks.

--
Best regards,
Szymon Janc