Changes in protocols/twitter/twitter.c [61e7e02:33528bd]

File:

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

protocols/twitter/twitter.c

@@ -469 +469 @@
         g_regex_match(regex, msg, 0, &match_info);
         while (g_match_info_matches(match_info)) {
-                gchar *s, *url;
-
-                url = g_match_info_fetch(match_info, 2);
+                gchar *url = g_match_info_fetch(match_info, 2);
                 url_len_diff += target_len - g_utf8_strlen(url, -1);
-
                 /* Add another character for https://t.co/... URLs */
-                if ((s = g_match_info_fetch(match_info, 3))) {
+                if (g_match_info_fetch(match_info, 3) != NULL) {
                         url_len_diff += 1;
-                        g_free(s);
                 }
                 g_free(url);
@@ -863 +859 @@
 }
 
+/* Parses a decimal or hex tweet ID, returns TRUE on success */
+static gboolean twitter_parse_id(char *string, int base, guint64 *id)
+{
+        guint64 parsed;
+        char *endptr;
+
+        errno = 0;
+        parsed = g_ascii_strtoull(string, &endptr, base);
+        if (errno || endptr == string || *endptr != '\0') {
+                return FALSE;
+        }
+        *id = parsed;
+        return TRUE;
+}
+
 bee_user_t twitter_log_local_user;
 
@@ -892 +903 @@
                         arg++;
                 }
-                if (parse_int64(arg, 16, &id) && 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;
-                } else if (parse_int64(arg, 10, &id)) {
+                } 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