Changeset cfbecc9 for protocols

Timestamp:

2013-01-06T12:09:35Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a906b77

Parents:

62a2bf9

Message:

Fixed NULL pointer dereference bug when newly connecting to identi.ca.
Twitter sends us our real username on OAuth completion, which is then used
instead of the username supplied by the user. Identi.ca doesn't supply
this info so BitlBee would instead replace td->user with a NULL pointer.

File:

• protocols/twitter/twitter.c (modified) (1 diff)

protocols/twitter/twitter.c

@@ -193 +193 @@
                 g_free(msg);
         } else if (info->stage == OAUTH_ACCESS_TOKEN) {
+                const char *sn;
+                
                 if (info->token == NULL || info->token_secret == NULL) {
                         imcb_error(ic, "OAuth error: %s", twitter_parse_error(info->http));
                         imc_logout(ic, TRUE);
                         return FALSE;
-                } else {
-                        const char *sn = oauth_params_get(&info->params, "screen_name");
-
-                        if (sn != NULL && ic->acc->prpl->handle_cmp(sn, ic->acc->user) != 0) {
+                }
+                
+                if ((sn = oauth_params_get(&info->params, "screen_name"))) {
+                        if (ic->acc->prpl->handle_cmp(sn, ic->acc->user) != 0)
                                 imcb_log(ic, "Warning: You logged in via OAuth as %s "
-                                         "instead of %s.", sn, ic->acc->user);
-                        }
+                                         "instead of %s.", sn, ic->acc->user);
                         g_free(td->user);
                         td->user = g_strdup(sn);