Changeset bbff22d

Timestamp:

2015-10-09T02:41:01Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

b87e5dc

Parents:

c4e61db

git-author:

dequis <dx@…> (08-10-15 07:48:06)

git-committer:

dequis <dx@…> (09-10-15 02:41:01)

Message:

twitter: Fix some nitpicky issues reported by coverity

Mostly minor rare leaks that happen in error conditions, and one
dereference before null check in twitter_logout (the null check is
probably the wrong one there, but it doesn't hurt to keep it)

Location:

protocols/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter_http.c (modified) (3 diffs)
• twitter_lib.c (modified) (4 diffs)

protocols/twitter/twitter.c

@@ -678 +678 @@
         ic->flags &= ~OPT_LOGGED_IN;
 
-        // Remove the main_loop function from the function queue.
-        b_event_remove(td->main_loop_id);
-
-        if (td->timeline_gc) {
-                imcb_chat_free(td->timeline_gc);
-        }
-
         if (td) {
+                // Remove the main_loop function from the function queue.
+                b_event_remove(td->main_loop_id);
+
+                if (td->timeline_gc) {
+                        imcb_chat_free(td->timeline_gc);
+                }
+
                 if (td->filter_update_id > 0) {
                         b_event_remove(td->filter_update_id);

protocols/twitter/twitter_http.c

@@ -53 +53 @@
         char *tmp;
         GString *request = g_string_new("");
-        void *ret;
+        void *ret = NULL;
         char *url_arguments;
         url_t *base_url = NULL;
@@ -72 +72 @@
                 base_url = g_new0(url_t, 1);
                 if (!url_set(base_url, url_string)) {
-                        g_free(base_url);
-                        return NULL;
+                        goto error;
                 }
         }
@@ -132 +131 @@
         }
 
+error:
         g_free(url_arguments);
         g_string_free(request, TRUE);

protocols/twitter/twitter_lib.c

@@ -312 +312 @@
         td = ic->proto_data;
 
+        // Parse the data.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = td->follow_ids;
-
-        // Parse the data.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
 
         twitter_xt_get_friends_id_list(parsed, txl);
@@ -388 +388 @@
         }
 
+        // Get the user list from the parsed xml feed.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = NULL;
 
-        // Get the user list from the parsed xml feed.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
         twitter_xt_get_users(parsed, txl);
         json_value_free(parsed);
@@ -1385 +1386 @@
         td = ic->proto_data;
 
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
-
         // The root <statuses> node should hold the list of statuses <status>
         if (!(parsed = twitter_parse_response(ic, req))) {
                 goto end;
         }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
         twitter_xt_get_status_list(ic, parsed, txl);
         json_value_free(parsed);
@@ -1424 +1426 @@
         td = ic->proto_data;
 
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
-
         // The root <statuses> node should hold the list of statuses <status>
         if (!(parsed = twitter_parse_response(ic, req))) {
                 goto end;
         }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
         twitter_xt_get_status_list(ic, parsed, txl);
         json_value_free(parsed);