Mercurial > pidgin
changeset 13421:2ec69a9763a5
[gaim-migrate @ 15796]
Resolve CID 16:
Event var_compare_op: Added "gc" due to comparison "gc != 0"
126 if (gc != NULL && gc->prpl != NULL)
127 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
Event var_deref_op: Variable "gc" tracked as NULL was dereferenced.
132 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, gc->account);
I've changed the gc and gc->prpl NULL checks into a g_return_if_fail().
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 07 Mar 2006 02:15:36 +0000 |
| parents | d6530e0cd89f |
| children | b53fe4fa46b6 |
| files | src/server.c |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/server.c Tue Mar 07 02:11:59 2006 +0000 +++ b/src/server.c Tue Mar 07 02:15:36 2006 +0000 @@ -119,12 +119,14 @@ GaimConversation *conv; GaimAccount *account; GaimPresence *presence; - GaimPluginProtocolInfo *prpl_info = NULL; + GaimPluginProtocolInfo *prpl_info; int val = -EINVAL; const gchar *auto_reply_pref; - if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + g_return_val_if_fail(gc != NULL, val); + g_return_val_if_fail(gc->prpl != NULL, val); + + prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); account = gaim_connection_get_account(gc); presence = gaim_account_get_presence(account);