Attachment 314880 Details for Bug 454227 – Fix this crash

[patch] Fix this crash

0.19.0cvs6.patchset (text/plain), 2.41 KB, created by Colin Leroy on 2008-08-24 09:23:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Leroy

Created: 2008-08-24 09:23:50 UTC

Size: 2.41 KB

patch

obsolete

>Index: libgtkhtml/css/cssmatcher.c
>===================================================================
>RCS file: /srv/cvs/claws-mail/plugins/gtkhtml2_viewer/libgtkhtml/css/Attic/cssmatcher.c,v
>retrieving revision 1.1.2.1
>retrieving revision 1.1.2.2
>diff -u -p -u -r1.1.2.1 -r1.1.2.2
>--- libgtkhtml/css/cssmatcher.c	11 Feb 2008 17:50:36 -0000	1.1.2.1
>+++ libgtkhtml/css/cssmatcher.c	21 Aug 2008 16:00:28 -0000	1.1.2.2
>@@ -587,10 +587,10 @@ handle_background_image (HtmlDocument *d
> 		HtmlImage *image = NULL;
> 		gchar *str = css_value_to_string (val->v.function->args);
> 
>-		if (str) {
>+		if (str && val->v.function->args->value_type == CSS_STRING) {
> 			image = html_image_factory_get_image (document->image_factory, val->v.function->args->v.s);
>-			g_free (str);
> 		}
>+		g_free (str);
> 		if (image) {
> 			html_style_set_background_image (style, image);
> 			g_object_unref (G_OBJECT(image));
>Index: libgtkhtml/layout/html/htmlboximage.c
>===================================================================
>RCS file: /srv/cvs/claws-mail/plugins/gtkhtml2_viewer/libgtkhtml/layout/html/Attic/htmlboximage.c,v
>retrieving revision 1.1.2.1
>retrieving revision 1.1.2.2
>diff -u -p -u -r1.1.2.1 -r1.1.2.2
>--- libgtkhtml/layout/html/htmlboximage.c	11 Feb 2008 17:52:02 -0000	1.1.2.1
>+++ libgtkhtml/layout/html/htmlboximage.c	21 Aug 2008 16:00:29 -0000	1.1.2.2
>@@ -58,6 +58,11 @@ html_box_image_paint_border (HtmlBox *bo
> 	if (loading_image == NULL)
> 		loading_image = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-loading-icon", 16, 0, NULL);
> 
>+	if (error_image)
>+		g_object_ref(G_OBJECT(error_image));
>+	if (loading_image)
>+		g_object_ref(G_OBJECT(loading_image));
>+
> 	if (!dark_grey) {
> 		dark_grey = html_color_new_from_rgb (127, 127, 127);
> 		light_grey = html_color_new_from_rgb (191, 191, 191);
>@@ -81,13 +86,13 @@ html_box_image_paint_border (HtmlBox *bo
> 	if (width  >= gdk_pixbuf_get_width (error_image) + 4 &&
> 	    height >= gdk_pixbuf_get_height (error_image) + 4) {
> 		
>-		if (image->image->broken) {
>+		if (image->image->broken && error_image) {
> 			html_painter_draw_pixbuf (painter, area, error_image, 0, 0,
> 						  x + 2, y + 2,
> 						  gdk_pixbuf_get_width (error_image),
> 						  gdk_pixbuf_get_height (error_image));
> 		}
>-		else if (image->image->loading) {
>+		else if (image->image->loading && loading_image) {
> 			html_painter_draw_pixbuf (painter, area, loading_image, 0, 0,
> 						  x + 2, y + 2,
> 						  gdk_pixbuf_get_width (loading_image),

Actions: View | Diff

Attachments on bug 454227: 311111 | 314880