Changeset 3d93aed

Timestamp:

2010-05-23T14:52:41Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ba3233c

Parents:

228fc18

Message:

Restructure Twitter error parser a bit, it fed a NULL pointer to the XML
parser sometimes (which fails safely but is a bad idea anyway).

File:

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

protocols/twitter/twitter_lib.c

@@ -122 +122 @@
 {
         static char *ret = NULL;
-        struct xt_parser *xp;
+        struct xt_parser *xp = NULL;
         struct xt_node *node;
-        char *err_s = NULL;
         
         g_free(ret);
         ret = NULL;
         
-        xp = xt_new(NULL, NULL);
-        xt_feed(xp, req->reply_body, req->body_size);
-        
-        if ((node = xt_find_node(xp->root, "hash")) &&
-            (node = xt_find_node(node->children, "error")) &&
-            node->text_len > 0)
-                err_s = node->text;
-        
-        if (err_s)
-        {
-                ret = g_strdup_printf("%s (%s)", req->status_string, err_s);
+        if (req->body_size > 0)
+        {
+                xp = xt_new(NULL, NULL);
+                xt_feed(xp, req->reply_body, req->body_size);
+                
+                if ((node = xt_find_node(xp->root, "hash")) &&
+                    (node = xt_find_node(node->children, "error")) &&
+                    node->text_len > 0)
+                {
+                        ret = g_strdup_printf("%s (%s)", req->status_string, node->text);
+                        xt_free(xp);
+                        return ret;
+                }
+                
                 xt_free(xp);
-                return ret;
-        }
-        else
-        {
-                return req->status_string;
-        }
+        }
+        
+        return req->status_string;
 }