| Message ID | 20200826063742.76007-1-sonnysasaka@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [BlueZ] gatt: Accept empty array in parse_includes() | expand |
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.
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; }