pidgin/pidgin

Don't check for null before freeing.

2014-01-20, Mark Doliner
d96f03bbc4e6
Parents f0fbb41b072e
Children 2561402bb3fd
Don't check for null before freeing.
--- a/libpurple/protocols/yahoo/libymsg.c Mon Jan 20 00:27:54 2014 -0800
+++ b/libpurple/protocols/yahoo/libymsg.c Mon Jan 20 10:15:55 2014 -0800
@@ -491,12 +491,10 @@
static void yahoo_process_cookie(YahooData *yd, char *c)
{
if (c[0] == 'Y') {
- if (yd->cookie_y)
- g_free(yd->cookie_y);
+ g_free(yd->cookie_y);
yd->cookie_y = _getcookie(c);
} else if (c[0] == 'T') {
- if (yd->cookie_t)
- g_free(yd->cookie_t);
+ g_free(yd->cookie_t);
yd->cookie_t = _getcookie(c);
} else
purple_debug_info("yahoo", "Unrecognized cookie '%c'\n", c[0]);
@@ -1442,7 +1440,7 @@
yahoo_buddy_denied_our_add(gc, who, msg);
} else
purple_debug_error("yahoo", "Received unknown authorization response of %d from buddy '%s'.\n", response, who ? who : "(Unknown Buddy)");
- g_free(who);
+ g_free(who);
}
/* Buddy requested authorization to add us. */
else if (pkt->status == 3) {
@@ -3826,7 +3824,6 @@
for (l = yd->cookies; l; l = l->next) {
g_free(l->data);
- l->data=NULL;
}
g_slist_free(yd->cookies);