Mercurial > pidgin
changeset 14624:776615acf309
[gaim-migrate @ 17356]
After the comments on gaim-devel about 'bad' code, I looked into the function referenced. It appears that yahoo_buddy_icon_upload_connected() is only called as a callback. It's registered from yahoo_buddy_icon_upload(). yahoo_buddy_icon_upload() is only called twice. In neither case can a NULL make it down to yahoo_buddy_icon_upload_connected(). As this is an exceptional case rather than a normal one, a g_return_if_fail() is more appropriate. That adds logging, makes the intent clearer, and will help the Coverity software detect violations of this assumption.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 26 Sep 2006 17:38:09 +0000 |
| parents | 86e1ebd8ee7f |
| children | 3e193cf68660 |
| files | libgaim/protocols/yahoo/yahoo_picture.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgaim/protocols/yahoo/yahoo_picture.c Tue Sep 26 00:28:02 2006 +0000 +++ b/libgaim/protocols/yahoo/yahoo_picture.c Tue Sep 26 17:38:09 2006 +0000 @@ -438,8 +438,7 @@ GaimAccount *account; struct yahoo_data *yd; - if (!d) - return; + g_return_if_fail(d != NULL); gc = d->gc; account = gaim_connection_get_account(gc); @@ -500,6 +499,8 @@ GaimAccount *account = gaim_connection_get_account(gc); struct yahoo_data *yd = gc->proto_data; + g_return_if_fail(d != NULL); + if (yd->jp) { if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST), gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),