From c3af5ccdbc22e8990d04ec2f89ad1f2e053655e9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 24 Mar 2003 03:16:58 +0000 Subject: 2003-03-23 Havoc Pennington * dbus/dbus-threads.c (dbus_mutex_new, dbus_condvar_new): with DBUS_BUILD_TESTS, actually alloc/free a block of memory for the mutex, so we can check for proper memory management and OOM handling. * dbus/dbus-dataslot.c: remove the mutex from DBusDataSlotAllocator and lock it manually when using it, to simplify fitting it into the global slots framework. * dbus/dbus-threads.c (init_static_locks): rework how we're handling global locks so they are easily shut down. * bus/policy.c (bus_policy_append_rule): fix * bus/test-main.c (main): check for memleaks * dbus/dbus-test.c (dbus_internal_do_not_use_run_tests): make test suite check for memleaks * dbus/dbus-memory.c: add support in test mode for tracking number of outstanding blocks --- bus/policy.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bus/policy.c') diff --git a/bus/policy.c b/bus/policy.c index 015757a0..75013c85 100644 --- a/bus/policy.c +++ b/bus/policy.c @@ -73,6 +73,10 @@ bus_policy_rule_unref (BusPolicyRule *rule) case BUS_POLICY_RULE_OWN: dbus_free (rule->d.own.service_name); break; + case BUS_POLICY_RULE_USER: + case BUS_POLICY_RULE_GROUP: + _dbus_assert_not_reached ("invalid rule"); + break; } dbus_free (rule); @@ -203,6 +207,10 @@ bus_policy_optimize (BusPolicy *policy) remove_preceding = rule->d.own.service_name == NULL; break; + case BUS_POLICY_RULE_USER: + case BUS_POLICY_RULE_GROUP: + _dbus_assert_not_reached ("invalid rule"); + break; } if (remove_preceding) @@ -220,7 +228,7 @@ dbus_bool_t bus_policy_append_rule (BusPolicy *policy, BusPolicyRule *rule) { - if (!_dbus_list_append (policy->rules, rule)) + if (!_dbus_list_append (&policy->rules, rule)) return FALSE; bus_policy_rule_ref (rule); -- cgit