gtkhtml2 r1159 - in trunk: . libgtkhtml/graphics

[dobey svn gnome org]

Author: dobey
Date: Tue Jul 29 22:30:14 2008
New Revision: 1159
URL: http://svn.gnome.org/viewvc/gtkhtml2?rev=1159&view=rev

Log:
2008-07-29  Rodney Dawes  <dobey pwns gmail com>

	* libgtkhtml/graphics/htmlcolor.c (html_color_new_from_name):
	Return NULL if rgb is specified without an actual color
	Patch from Michal ÄihaÅ <michal cihar com>

	Fixes #503168



Modified:
   trunk/ChangeLog
   trunk/libgtkhtml/graphics/htmlcolor.c

Modified: trunk/libgtkhtml/graphics/htmlcolor.c
==============================================================================
--- trunk/libgtkhtml/graphics/htmlcolor.c	(original)
+++ trunk/libgtkhtml/graphics/htmlcolor.c	Tue Jul 29 22:30:14 2008
@@ -328,7 +328,9 @@
 	else if (strstr (color_name, "rgb")) {
 		gchar *ptr;
 		
-		ptr = strstr (color_name, "(") + 1;
+		ptr = strstr (color_name, "(");
+		if (ptr == NULL) return NULL;
+		ptr++;
 		while (*ptr && *ptr == ' ') ptr++;
 		red = strtol (ptr, &ptr, 10);
 		ptr++;