diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-08-07 01:15:14 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-08-07 01:15:14 -0400 |
| commit | d865756c84df42d176db935f07fde428ca2080b4 (patch) | |
| tree | 171018273a1901d6f77c06c94cf3b90d67e3fdb0 /libpurple/contact.c | |
| parent | 9a491a5be0a65c2f69c23e7973aef79ac73944c8 (diff) | |
| download | pidgin-d865756c84df42d176db935f07fde428ca2080b4.tar.gz | |
Fix broken `priv != NULL` checks in libpurple.
The `*_get_instance_private` function just returns input value + offset,
so it is impossible for `priv` to be `NULL`.
Diffstat (limited to 'libpurple/contact.c')
| -rw-r--r-- | libpurple/contact.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/libpurple/contact.c b/libpurple/contact.c index 60fcb112e9..8ed691f0fd 100644 --- a/libpurple/contact.c +++ b/libpurple/contact.c @@ -59,8 +59,6 @@ purple_contact_compute_priority_buddy(PurpleContact *contact) { PurpleContactPrivate *priv = purple_contact_get_instance_private(contact); - g_return_if_fail(priv != NULL); - priv->priority_buddy = NULL; for (bnode = PURPLE_BLIST_NODE(contact)->child; bnode != NULL; @@ -112,14 +110,14 @@ purple_contact_get_group(const PurpleContact *contact) void purple_contact_set_alias(PurpleContact *contact, const char *alias) { + PurpleContactPrivate *priv = NULL; PurpleIMConversation *im; PurpleBlistNode *bnode; char *old_alias; char *new_alias = NULL; - PurpleContactPrivate *priv = - purple_contact_get_instance_private(contact); - g_return_if_fail(priv != NULL); + g_return_if_fail(PURPLE_IS_CONTACT(contact)); + priv = purple_contact_get_instance_private(contact); if ((alias != NULL) && (*alias != '\0')) new_alias = purple_utf8_strip_unprintables(alias); @@ -163,11 +161,11 @@ purple_contact_set_alias(PurpleContact *contact, const char *alias) const char *purple_contact_get_alias(PurpleContact* contact) { - PurpleContactPrivate *priv = - purple_contact_get_instance_private(contact); + PurpleContactPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_CONTACT(contact), NULL); + priv = purple_contact_get_instance_private(contact); if (priv->alias) return priv->alias; @@ -196,21 +194,21 @@ gboolean purple_contact_on_account(PurpleContact *c, PurpleAccount *account) void purple_contact_invalidate_priority_buddy(PurpleContact *contact) { - PurpleContactPrivate *priv = - purple_contact_get_instance_private(contact); + PurpleContactPrivate *priv = NULL; - g_return_if_fail(priv != NULL); + g_return_if_fail(PURPLE_IS_CONTACT(contact)); + priv = purple_contact_get_instance_private(contact); priv->priority_valid = FALSE; } PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact) { - PurpleContactPrivate *priv = - purple_contact_get_instance_private(contact); + PurpleContactPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_CONTACT(contact), NULL); + priv = purple_contact_get_instance_private(contact); if (!priv->priority_valid) purple_contact_compute_priority_buddy(contact); |