File lxpanel-0.5.5-fix-panel_draw_label_text.patch of Package lxpanel

Overview Repositories Revisions Requests Users Attributes Meta

File lxpanel-0.5.5-fix-panel_draw_label_text.patch of Package lxpanel (Revision 461a9a08a85aced4858510552b90f882)

Currently displaying revision 461a9a08a85aced4858510552b90f882 , Show latest

commit cd93c810d7c7ac2bafa53950e012f80ddaacf80a
Author: Marty Jack <martyj@linux.local>
Date: Sun May 9 18:12:37 2010 -0400

Buffer overflow in panel_draw_label_text (Bug2998726)

diff --git a/src/panel.c b/src/panel.c
index 6ae6baa..d383d61 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -1054,8 +1054,6 @@ void panel_adjust_geometry_terminology(Panel * p)
 /* Draw text into a label, with the user preference color and optionally bold. */
 void panel_draw_label_text(Panel * p, GtkWidget * label, char * text, gboolean bold, gboolean custom_color)
 {
- char buffer[512];
-
 if (text == NULL)
 {
 /* Null string. */
@@ -1068,7 +1066,7 @@ void panel_draw_label_text(Panel * p, GtkWidget * label, char * text, gboolean b
 int font_desc;
 if (p->icon_size < 20) 
 font_desc = 9;
- else if (p->icon_size >= 20 && p->icon_size < 26)
+ else if (p->icon_size >= 20 && p->icon_size < 36)
 font_desc = 10;
 else
 font_desc = 12;
@@ -1091,23 +1089,25 @@ void panel_draw_label_text(Panel * p, GtkWidget * label, char * text, gboolean b
 if ((custom_color) && (p->usefontcolor))
 {
 /* Color, optionally bold. */
- g_snprintf(buffer, sizeof(buffer), "%s%s%s",
+ gchar * text = g_strdup_printf("%s%s%s",
 font_desc,
 gcolor2rgb24(&p->gfontcolor),
 ((bold) ? "" : ""),
 valid_markup,
 ((bold) ? "" : ""));
- gtk_label_set_markup(GTK_LABEL(label), buffer);
+ gtk_label_set_markup(GTK_LABEL(label), text);
+ g_free(text);
 }
 else
 {
 /* No color, optionally bold. */
- g_snprintf(buffer, sizeof(buffer), "%s%s%s",
+ gchar * text = g_strdup_printf("%s%s%s",
 font_desc,
 ((bold) ? "" : ""),
 valid_markup,
 ((bold) ? "" : ""));
- gtk_label_set_markup(GTK_LABEL(label), buffer);
+ gtk_label_set_markup(GTK_LABEL(label), text);
+ g_free(text);
 }
 g_free(escaped_text);
 }

Places

File lxpanel-0.5.5-fix-panel_draw_label_text.patch of Package lxpanel (Revision 461a9a08a85aced4858510552b90f882)

Places