Skip to contentSkip to conversation

station: fix setting an empty affinities list

PATCH Applied James Prestwood 2 participants 2 messages Apr 17, 2025 – Apr 23, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 station: fix setting an empty affinities list

A prior patch broke this by checking the return of l_dbus_message_iter_next_entry. This was really subtle but the logic actually relied on _not_ checking that return in order to handle empty lists.

Instead of reverting the logic was adapted/commented to make it more clear what the API expects from DBus. If list contains at least one value the first element path will get set, if it contains zero values "new_path" will be set to NULL which will then cause the list to be cleared later on.

This both fixes the regression, and makes it clear that a zero element list is supported and handled.

---
 src/station.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
src/station.c +8 -4
index 14c93671..d8016c2a 100644
@@ -4815,7 +4815,7 @@ static struct l_dbus_message *station_property_set_affinities(
 	struct l_dbus_message_iter array;
 	const char *sender = l_dbus_message_get_sender(message);
 	char *old_path = l_queue_peek_head(station->affinities);
-	const char *new_path = NULL;
+	const char *new_path;
 	struct scan_bss *new_bss = NULL;
 	struct scan_bss *old_bss = NULL;
 	bool lower_threshold = false;
@@ -4835,11 +4835,15 @@ static struct l_dbus_message *station_property_set_affinities(
 	if (!l_dbus_message_iter_get_variant(new_value, "ao", &array))
 		return dbus_error_invalid_args(message);
 
-	/* Get first entry, there should be only one */
+	/* Get first entry, or if an empty array set the path to NULL */
 	if (!l_dbus_message_iter_next_entry(&array, &new_path))
-		return dbus_error_invalid_args(message);
+		new_path = NULL;
 
-	if (l_dbus_message_iter_next_entry(&array, &new_path))
+	/*
+	 * Only allowing single values for now. If there is more than a single
+	 * value, fail
+	 */
+	if (new_path && l_dbus_message_iter_next_entry(&array, &new_path))
 		return dbus_error_invalid_args(message);
 
 	old_path = l_queue_peek_head(station->affinities);
Signature · 1 line
2.34.1
#1 lore raw

Hi James,

Quoted 11 lines · James Prestwood

A prior patch broke this by checking the return of l_dbus_message_iter_next_entry. This was really subtle but the logic actually relied on _not_ checking that return in order to handle empty lists.

Instead of reverting the logic was adapted/commented to make it more clear what the API expects from DBus. If list contains at least one value the first element path will get set, if it contains zero values "new_path" will be set to NULL which will then cause the list to be cleared later on.

Quoted 6 lines

This both fixes the regression, and makes it clear that a zero element list is supported and handled.

---
  src/station.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)

Applied, thanks.

Regards,
-Denis