Merge bccfad3de2 into 6b9d0e8647

Fix https://bugs.gentoo.org/927179

src/config/color.c

@@ -361,8 +361,19 @@ find_closest_col(int h, int s, int l)
 static int
 find_col(const char* col_name, int n)
 {
+    char* endptr;
+    unsigned long col_value = strtoul(col_name, &endptr, 0);
     char name[32] = { 0 };
 
+    /*
+     * When the col_name is a uint8, then we don’t need to look up by
+     * color name (which is problematic given the duplicate names)
+     */
+
+    if ((*endptr == '\0' || *endptr == '\n') && col_value <= UINT8_MAX) {
+        return (int)col_value;
+    }
+
     /*
      * make a null terminated version of col_name. we don't want to
      * use strNcasecmp because we could end up matching blue3 with

tests/unittests/config/stub_accounts.c

@@ -16,7 +16,7 @@ accounts_close(void)
 }
 
 char*
-accounts_find_all(char* prefix)
+accounts_find_all(const char* const prefix, gboolean previous, void* context)
 {
     return NULL;
 }