Accept colors with arbitrary sequences of leading & and H

diff --git a/libass/ass_utils.c b/libass/ass_utils.c
index 3dab74ca41063e0a90bedebec4df553dbc15a9a0..3c2c40a3e7cbe87c430529367d052c365e95b7d1 100644 (file)
--- a/libass/ass_utils.c
+++ b/libass/ass_utils.c
@@ -81,7 +81,8 @@ int strtocolor(ASS_Library *library, char **q, uint32_t *res, int hex)
     int base = hex ? 16 : 10;
 
     if (*p == '&')
-        ++p;
+        while (*p == '&')
+            ++p;
     else
         ass_msg(library, MSGL_DBG2, "suspicious color format: \"%s\"\n", p);
 
@@ -92,6 +93,9 @@ int strtocolor(ASS_Library *library, char **q, uint32_t *res, int hex)
         result = mystrtou32(&p, base, &color);
     }
 
+    while (*p == '&' || *p == 'H')
+        ++p;
+
     {
         unsigned char *tmp = (unsigned char *) (&color);
         unsigned char b;