From: Christian Eggers <ceggers@arri.de>
To: <linux-bluetooth@vger.kernel.org>
Cc: Christian Eggers <ceggers@arri.de>
Subject: [PATCH BlueZ 9/9] battery: provided_battery_property_changed_cb: check for NULL iterator
Date: Fri, 23 Sep 2022 12:27:27 +0200 [thread overview]
Message-ID: <20220923102727.10636-1-ceggers@arri.de> (raw)
In-Reply-To: <20220923102421.10336-1-ceggers@arri.de>
The passed iterator can be NULL as in
gdbus/client.c::properties_changed():
...
proxy->prop_func(..., ..., iter=NULL, ...)
+--src/battery.c::provided_battery_property_changed_cb(, , iter, );
+--dbus_message_iter_get_arg_type(iter);
...
---
src/battery.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/battery.c b/src/battery.c
index 77fee22b6e61..88a53e80e890 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -252,7 +252,7 @@ static void provided_battery_property_changed_cb(GDBusProxy *proxy,
DBusMessageIter *iter,
void *user_data)
{
- uint8_t percentage;
+ uint8_t percentage = 0;
const char *export_path;
DBusMessageIter dev_iter;
@@ -264,10 +264,12 @@ static void provided_battery_property_changed_cb(GDBusProxy *proxy,
if (strcmp(name, "Percentage") != 0)
return;
- if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_BYTE)
- return;
+ if (iter) {
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_BYTE)
+ return;
- dbus_message_iter_get_basic(iter, &percentage);
+ dbus_message_iter_get_basic(iter, &percentage);
+ }
DBG("battery percentage changed on %s, percentage = %d",
g_dbus_proxy_get_path(proxy), percentage);
--
2.35.3
prev parent reply other threads:[~2022-09-23 10:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 10:24 [PATCH BlueZ 0/9] properties_changed: check for NULL iterator Christian Eggers
2022-09-23 10:24 ` [PATCH BlueZ 1/9] advertising: parse_secondary: fix loop condition Christian Eggers
2022-09-23 11:21 ` properties_changed: check for NULL iterator bluez.test.bot
2022-09-23 10:24 ` [PATCH BlueZ 2/9] advertising: parse_secondary: fix mask value Christian Eggers
2022-09-23 10:24 ` [PATCH BlueZ 3/9] advertising: parse_secondary: check for NULL iterator Christian Eggers
2022-09-23 10:24 ` [PATCH BlueZ 4/9] advertising: parse_min_interval: reset min_interval if iter is NULL Christian Eggers
2022-09-23 10:26 ` Christian Eggers
2022-09-23 20:50 ` patchwork-bot+bluetooth
2022-09-23 10:26 ` [PATCH BlueZ 5/9] advertising: parse_[min|max]_interval: reset value " Christian Eggers
2022-09-23 10:26 ` [PATCH BlueZ 6/9] advertising: parse_tx_power: " Christian Eggers
2022-09-23 10:26 ` [PATCH BlueZ 7/9] client/gatt: proxy_property_changed: check for NULL iterator Christian Eggers
2022-09-23 10:27 ` [PATCH BlueZ 8/9] gatt: " Christian Eggers
2022-09-23 10:27 ` Christian Eggers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220923102727.10636-1-ceggers@arri.de \
--to=ceggers@arri.de \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.