Make color parsing more robust and correct. (#93804)

	* pango/pango-color.c (pango_color_parse): Make color parsing
	more robust and correct. (#93804)

	* tests/testcolor.c: Tests for pango_color_parse.

	* tests/Makefile.am: Build testcolor.

	* tests/runtests.sh: Run testcolor.

4 files changed, 84 insertions, 3 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4614025c..4571afb4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,18 +41,22 @@ TESTS=runtests.sh
 
 noinst_PROGRAMS = gen-all-unicode dump-boundaries
 
-check_PROGRAMS = testboundaries $(CXX_TEST)
+check_PROGRAMS = testboundaries testcolor $(CXX_TEST)
 
 gen_all_unicode_SOURCES = gen-all-unicode.c
 
 testboundaries_SOURCES = testboundaries.c
 
+testcolor_SOURCES = testcolor.c
+
 dump_boundaries_SOURCES = dump-boundaries.c
 
 gen_all_unicode_LDADD = $(GLIB_LIBS)
 
 testboundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
 
+testcolor_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
+
 dump_boundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la
 
 if HAVE_CXX
@@ -71,3 +75,4 @@ all-unicode.txt: gen-all-unicode
 	./gen-all-unicode > all-unicode.txt
 
 all-local: all-unicode.txt
+
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 3fd0b110..897cd120 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 LOGFILE=runtests.log
-POTENTIAL_TESTS='testboundaries'
+POTENTIAL_TESTS='testboundaries testcolor'
 
 for I in $POTENTIAL_TESTS
 do
diff --git a/tests/runtests.sh.in b/tests/runtests.sh.in
index 3fd0b110..897cd120 100755
--- a/tests/runtests.sh.in
+++ b/tests/runtests.sh.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 LOGFILE=runtests.log
-POTENTIAL_TESTS='testboundaries'
+POTENTIAL_TESTS='testboundaries testcolor'
 
 for I in $POTENTIAL_TESTS
 do
diff --git a/tests/testcolor.c b/tests/testcolor.c
new file mode 100644
index 00000000..e41b053e
--- /dev/null
+++ b/tests/testcolor.c
@@ -0,0 +1,76 @@
+#include <glib.h>
+#include <pango/pango.h>
+
+typedef struct _ColorSpec {
+  const gchar *spec;
+  gboolean valid;
+  guint16 red;
+  guint16 green; 
+  guint16 blue;
+} ColorSpec;
+
+gboolean test_color (ColorSpec *spec)
+{
+  PangoColor color;
+  gboolean accepted;
+
+  accepted = pango_color_parse (&color, spec->spec);
+
+  if (accepted == spec->valid &&
+      (!accepted || 
+      (color.red == spec->red &&
+       color.green == spec->green &&
+       color.blue == spec->blue)))
+    return TRUE;
+  else
+    return FALSE;
+}
+
+
+ColorSpec specs [] = {
+  { "#abc",          1, 0xaaaa, 0xbbbb, 0xcccc },
+  { "#aabbcc",       1, 0xaaaa, 0xbbbb, 0xcccc },
+  { "#aaabbbccc",    1, 0xaaaa, 0xbbbb, 0xcccc },
+  { "#100100100",    1, 0x1001, 0x1001, 0x1001 },
+  { "#aaaabbbbcccc", 1, 0xaaaa, 0xbbbb, 0xcccc },
+  { "#fff",          1, 0xffff, 0xffff, 0xffff },
+  { "#ffffff",       1, 0xffff, 0xffff, 0xffff },
+  { "#fffffffff",    1, 0xffff, 0xffff, 0xffff },
+  { "#ffffffffffff", 1, 0xffff, 0xffff, 0xffff },
+  { "#000",          1, 0x0000, 0x0000, 0x0000 },
+  { "#000000",       1, 0x0000, 0x0000, 0x0000 },
+  { "#000000000",    1, 0x0000, 0x0000, 0x0000 },
+  { "#000000000000", 1, 0x0000, 0x0000, 0x0000 },
+  { "#AAAABBBBCCCC", 1, 0xaaaa, 0xbbbb, 0xcccc },
+  { "#aa bb cc ",    0 },
+  { "#aa bb ccc",    0 },
+  { "#ab",           0 },
+  { "#aabb",         0 },
+  { "#aaabb",        0 },
+  { "aaabb",         0 },
+  { "",              0 },
+  { "#",             0 },
+  { "##fff",         0 },
+  { "#0000ff+",      0 },
+  { "#0000f+",       0 },
+  { "#0x00x10x2",    0 },
+  { NULL,            0 }
+};
+
+int 
+main (int argc, char *argv[]) 
+{
+  gboolean success;
+  ColorSpec *spec;
+  gchar *blob;
+
+  success = TRUE;
+  for (spec = specs; spec->spec; spec++)
+    success &= test_color (spec);
+
+  return !success;
+}
+
+
+
+