From d55cf4ce99d578e32442397dfd890983eb4a416b Mon Sep 17 00:00:00 2001 From: Alban Crequy Date: Wed, 24 Sep 2014 14:15:44 +0100 Subject: [PATCH 3/5] match_rule_to_string: returns NULL if no memory instead of looping --- bus/signals.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/bus/signals.c b/bus/signals.c index 828eefe..9e359a9 100644 --- a/bus/signals.c +++ b/bus/signals.c @@ -122,6 +122,7 @@ bus_match_rule_unref (BusMatchRule *rule) /* Note this function does not do escaping, so it's only * good for debug spew at the moment */ +/* returns NULL if no memory */ static char* match_rule_to_string (BusMatchRule *rule) { @@ -130,10 +131,7 @@ match_rule_to_string (BusMatchRule *rule) if (!_dbus_string_init (&str)) { - char *s; - while ((s = _dbus_strdup ("nomem")) == NULL) - ; /* only OK for debug spew... */ - return s; + return NULL; } if (rule->flags & BUS_MATCH_MESSAGE_TYPE) @@ -272,12 +270,7 @@ match_rule_to_string (BusMatchRule *rule) nomem: _dbus_string_free (&str); - { - char *s; - while ((s = _dbus_strdup ("nomem")) == NULL) - ; /* only OK for debug spew... */ - return s; - } + return NULL; } #endif /* defined(DBUS_ENABLE_VERBOSE_MODE) || defined(DBUS_ENABLE_STATS) */ @@ -1431,7 +1424,7 @@ bus_matchmaker_add_rule (BusMatchmaker *matchmaker, char *s = match_rule_to_string (rule); _dbus_verbose ("Added match rule %s to connection %p\n", - s, rule->matches_go_to); + s ? s : "nomem", rule->matches_go_to); dbus_free (s); } #endif @@ -1524,7 +1517,7 @@ bus_matchmaker_remove_rule_link (DBusList **rules, char *s = match_rule_to_string (rule); _dbus_verbose ("Removed match rule %s for connection %p\n", - s, rule->matches_go_to); + s ? s : "nomem", rule->matches_go_to); dbus_free (s); } #endif @@ -1561,7 +1554,7 @@ bus_matchmaker_remove_rule (BusMatchmaker *matchmaker, char *s = match_rule_to_string (rule); _dbus_verbose ("Removed match rule %s for connection %p\n", - s, rule->matches_go_to); + s ? s : "nomem", rule->matches_go_to); dbus_free (s); } #endif @@ -2038,7 +2031,7 @@ get_recipients_from_list (DBusList **rules, char *s = match_rule_to_string (rule); _dbus_verbose ("Checking whether message matches rule %s for connection %p\n", - s, rule->matches_go_to); + s ? s : "nomem", rule->matches_go_to); dbus_free (s); } #endif -- 1.8.5.3