X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atspi%2Fatspi-matchrule.c;h=8abeb1301aa444edeae6d2ef576706c52fa03882;hb=6395af932862454ed292d3623c18c59218ecbe7e;hp=1a17cf33570c1e0df9b7f70185f3965f97f7c741;hpb=2554a07c0bbee7defef5b2fca3a420d6cf42a770;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/atspi/atspi-matchrule.c b/atspi/atspi-matchrule.c index 1a17cf3..8abeb13 100644 --- a/atspi/atspi-matchrule.c +++ b/atspi/atspi-matchrule.c @@ -122,9 +122,6 @@ atspi_match_rule_new (AtspiStateSet *states, AtspiMatchRule *rule = g_object_new (ATSPI_TYPE_MATCH_RULE, NULL); int i; - if (!rule) - return NULL; - if (states) rule->states = g_object_ref (states); rule->statematchtype = statematchtype; @@ -219,7 +216,8 @@ _atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter) if (!dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "{ss}", &iter_dict)) return FALSE; - g_hash_table_foreach (rule->attributes, append_entry, &iter_dict); + if (rule->attributes) + g_hash_table_foreach (rule->attributes, append_entry, &iter_dict); dbus_message_iter_close_container (&iter_struct, &iter_dict); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_attributematchtype);