Changeset 552c8a5 for protocols

Timestamp:

2015-02-22T21:19:21Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

91f06e5

Parents:

273949d

git-author:

dequis <dx@…> (22-02-15 05:00:37)

git-committer:

dequis <dx@…> (22-02-15 21:19:21)

Message:

twitter_parse_id function, with better error handling than sscanf()

Fixes issues such as parsing "reply eo" as replying to "0e",
as reported by torrancew

File:

• protocols/twitter/twitter.c (modified) (3 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)
+{
+        guint64 parsed;
+        char *endptr;
+
+        errno = 0;
+        parsed = g_ascii_strtoull(string, &endptr, base);
+        if (errno || endptr == string || *endptr == '\0') {
+                return 0;
+        }
+        return parsed;
+}
+
 /** Convert the given bitlbee tweet ID, bitlbee username, or twitter tweet ID
  *  into a twitter tweet ID.
@@ -879 +893 @@
                         arg++;
                 }
-                if (sscanf(arg, "%" G_GINT64_MODIFIER "x", &id) == 1 &&
-                    id < TWITTER_LOG_LENGTH) {
+                if ((id = twitter_parse_id(arg, 16)) && id < TWITTER_LOG_LENGTH) {
                         bu = td->log[id].bu;
                         id = td->log[id].id;
@@ -887 +900 @@
                                 bu = NULL;
                         }
-                } else if (sscanf(arg, "%" G_GINT64_MODIFIER "d", &id) == 1) {
+                } else if ((id = twitter_parse_id(arg, 10))) {
                         /* Allow normal tweet IDs as well; not a very useful
                            feature but it's always been there. Just ignore