Changeset 8b91a1f for protocols

Timestamp:

2015-03-10T07:27:25Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

7320610

Parents:

e6f47fb

git-author:

dequis <dx@…> (06-03-15 08:27:06)

git-committer:

dequis <dx@…> (10-03-15 07:27:25)

Message:

twitter: Fix twitter_parse_id to accept 00 as a valid tweet

Also fix the endptr condition which was backwards and resulted in every
tweet id getting rejected, but you didn't see that one, this commit
really is about the tweet id 00 which is the most important tweet id.

File:

• protocols/twitter/twitter.c (modified) (4 diffs)

protocols/twitter/twitter.c

@@ -852 +852 @@
 }
 
-/* Parses a decimal or hex tweet ID, handling errors by returning 0 */
-static guint64 twitter_parse_id(char *string, int base)
+/* Parses a decimal or hex tweet ID, returns TRUE on success */
+static gboolean twitter_parse_id(char *string, int base, guint64 *id)
 {
         guint64 parsed;
@@ -860 +860 @@
         errno = 0;
         parsed = g_ascii_strtoull(string, &endptr, base);
-        if (errno || endptr == string || *endptr == '\0') {
-                return 0;
-        }
-        return parsed;
+        if (errno || endptr == string || *endptr != '\0') {
+                return FALSE;
+        }
+        *id = parsed;
+        return TRUE;
 }
 
@@ -893 +894 @@
                         arg++;
                 }
-                if ((id = twitter_parse_id(arg, 16)) && id < TWITTER_LOG_LENGTH) {
+                if (twitter_parse_id(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
                         bu = td->log[id].bu;
                         id = td->log[id].id;
@@ -900 +901 @@
                                 bu = NULL;
                         }
-                } else if ((id = twitter_parse_id(arg, 10))) {
+                } else if (twitter_parse_id(arg, 10, &id)) {
                         /* Allow normal tweet IDs as well; not a very useful
                            feature but it's always been there. Just ignore