]> granicus.if.org Git - libass/commitdiff
Don't treat :;<=>? as hexadecimal digits in color headers
authorOleg Oshmyan <chortos@inbox.lv>
Fri, 3 Feb 2017 13:45:55 +0000 (15:45 +0200)
committerOleg Oshmyan <chortos@inbox.lv>
Tue, 14 Feb 2017 17:42:24 +0000 (19:42 +0200)
Oops.

libass/ass_utils.c

index 9dc2358220ba1d742acd85b753abd2b842ffa4d9..03900f271c396dadcf1ff1d4a6a25b4fa50755c7 100644 (file)
@@ -192,7 +192,7 @@ static int read_digits(char **str, int base, uint32_t *res)
 
     while (1) {
         int digit;
-        if (*p >= '0' && *p < base + '0')
+        if (*p >= '0' && *p < FFMIN(base, 10) + '0')
             digit = *p - '0';
         else if (*p >= 'a' && *p < base - 10 + 'a')
             digit = *p - 'a' + 10;