Attachment 855919 Details for Bug 1056904 – Local copy of patch

[patch] Local copy of patch

CVE-2013-6478.diff (text/plain), 2.30 KB, created by Huzaifa S. Sidhpurwala on 2014-01-27 06:08:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Huzaifa S. Sidhpurwala

Created: 2014-01-27 06:08:00 UTC

Size: 2.30 KB

patch

obsolete

>changeset:   35214:2bb66ef1475e
>branch:      release-2.x.y
>user:        Mark Doliner <mark@kingant.net>
>date:        Mon Jan 13 23:32:25 2014 -0800
>summary:     Fix a crash when hovering over an exceptionally long URL (4074 characters,
>
>diff -r 57da02a6ff77 -r 2bb66ef1475e ChangeLog
>--- a/ChangeLog	Mon Jan 13 23:12:58 2014 -0800
>+++ b/ChangeLog	Mon Jan 13 23:32:25 2014 -0800
>@@ -22,6 +22,7 @@ version 2.10.8:
> 	* Impose maximum download size for all HTTP fetches.
> 
> 	Pidgin:
>+	* Fix crash displaying tooltip of long URLs. (CVE-2014-NNNN)
> 	* Better handling of URLs longer than 1000 letters.
> 	* Fix handling of multibyte UTF-8 characters in smiley themes. (#15756)
> 
>diff -r 57da02a6ff77 -r 2bb66ef1475e pidgin/gtkimhtml.c
>--- a/pidgin/gtkimhtml.c	Mon Jan 13 23:12:58 2014 -0800
>+++ b/pidgin/gtkimhtml.c	Mon Jan 13 23:32:25 2014 -0800
>@@ -514,7 +514,13 @@ gtk_imhtml_tip_paint (GtkIMHtml *imhtml)
> 
> 	g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
> 
>-	layout = gtk_widget_create_pango_layout(imhtml->tip_window, imhtml->tip);
>+	/* We set the text in a separate function call so we can specify a
>+	   max length.  This is important so the tooltip isn't too wide for
>+	   the screen, and also because some X library function exits the
>+	   process when it can't allocate enough memory for a super wide
>+	   tooltip. */
>+	layout = gtk_widget_create_pango_layout(imhtml->tip_window, NULL);
>+	pango_layout_set_text(layout, imhtml->tip, 200);
> 
> 	gtk_paint_flat_box (imhtml->tip_window->style, imhtml->tip_window->window,
> 						GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, imhtml->tip_window,
>@@ -561,7 +567,15 @@ gtk_imhtml_tip (gpointer data)
> 							  G_CALLBACK (gtk_imhtml_tip_paint), imhtml);
> 
> 	gtk_widget_ensure_style (imhtml->tip_window);
>-	layout = gtk_widget_create_pango_layout(imhtml->tip_window, imhtml->tip);
>+
>+	/* We set the text in a separate function call so we can specify a
>+	   max length.  This is important so the tooltip isn't too wide for
>+	   the screen, and also because some X library function exits the
>+	   process when it can't allocate enough memory for a super wide
>+	   tooltip. */
>+	layout = gtk_widget_create_pango_layout(imhtml->tip_window, NULL);
>+	pango_layout_set_text(layout, imhtml->tip, 200);
>+
> 	font = pango_context_load_font(pango_layout_get_context(layout),
> 			      imhtml->tip_window->style->font_desc);
> 
>

Actions: View | Diff

Attachments on bug 1056904: 855919