Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200826063742.76007-1-sonnysasaka@chromium.org>
In-Reply-To: <20200826063742.76007-1-sonnysasaka@chromium.org>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Thu, 27 Aug 2020 10:54:39 -0700
Message-ID: <CABBYNZ+EPTW1OHcZj_JYRrpbKy0zMbLQ9gc2yRCntxfEJDwXdw@mail.gmail.com>
Subject: Re: [PATCH BlueZ] gatt: Accept empty array in parse_includes()
To:     Sonny Sasaka <sonnysasaka@chromium.org>
Cc:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        Jie Jiang <jiejiang@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Hi Sonny,

On Tue, Aug 25, 2020 at 11:43 PM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
>
> From: Jie Jiang <jiejiang@chromium.org>
>
> Currently parse_includes() will return false if the "Includes" property
> is an empty array. Empty array in the "Includes" property should be
> treated as valid.
>
> Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org>
>
> ---
>  src/gatt-database.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/src/gatt-database.c b/src/gatt-database.c
> index 07d567078..e7e4a36a6 100644
> --- a/src/gatt-database.c
> +++ b/src/gatt-database.c
> @@ -2008,6 +2008,7 @@ static bool parse_includes(GDBusProxy *proxy, struct external_service *service)
>         DBusMessageIter iter;
>         DBusMessageIter array;
>         char *obj;
> +       int type;
>
>         /* Includes property is optional */
>         if (!g_dbus_proxy_get_property(proxy, "Includes", &iter))
> @@ -2018,9 +2019,9 @@ static bool parse_includes(GDBusProxy *proxy, struct external_service *service)
>
>         dbus_message_iter_recurse(&iter, &array);
>
> -       do {
> -               if (dbus_message_iter_get_arg_type(&array) !=
> -                                               DBUS_TYPE_OBJECT_PATH)
> +       while ((type = dbus_message_iter_get_arg_type(&array))
> +                                       != DBUS_TYPE_INVALID) {
> +               if (type != DBUS_TYPE_OBJECT_PATH)
>                         return false;
>
>                 dbus_message_iter_get_basic(&array, &obj);
> @@ -2028,11 +2029,12 @@ static bool parse_includes(GDBusProxy *proxy, struct external_service *service)
>                 if (!queue_push_tail(service->includes, obj)) {
>                         error("Failed to add Includes path in queue\n");
>                         return false;
> -
>                 }
>
>                 incr_attr_count(service, 1);
> -       } while (dbus_message_iter_next(&array));
> +
> +               dbus_message_iter_next(&array);
> +       }
>
>         return true;
>  }
> --
> 2.26.2

Applied, thanks.

-- 
Luiz Augusto von Dentz