[evolution-patches] Fix for Bug 327169 [gtkhtml]

[Rohini <srohini novell com>]

Hi

Attached fix for Bug 327169 – Critical warning and crash when reading
mail

Please Review.

Thanks,
Rohini

Index: htmltext.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltext.c,v
retrieving revision 1.287
diff -u -p -r1.287 htmltext.c
--- htmltext.c	21 Feb 2006 12:09:31 -0000	1.287
+++ htmltext.c	28 Feb 2006 04:04:43 -0000
@@ -938,8 +938,11 @@ html_text_calc_part_width (HTMLText *tex
 	PangoFont *font = NULL;
 	gchar *s = start;
 
-	g_return_val_if_fail (offset >= 0, 0);
-	g_return_val_if_fail (offset + len <= text->text_len, 0);
+	if (offset < 0)
+		return 0;
+
+	if (offset + len > text->text_len)
+		return 0;
 
 	if (need_ascent_descent) {
 		ascent = html_painter_engine_to_pango (painter,
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2167
diff -u -p -r1.2167 ChangeLog
--- ChangeLog	27 Feb 2006 12:50:28 -0000	1.2167
+++ ChangeLog	28 Feb 2006 04:07:26 -0000
@@ -1,3 +1,9 @@
+2006-02-28  Rohini S  <srohini novell com>
+
+	* htmltext.c (html_text_calc_part_width): Fix a critical warning
+
+	Fixes bug #327169
+
 2006-02-27  Rohini S  <srohini novell com>
 
 	* htmlengine.c (new_parse_body, parse_one_token):