AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

render: Fix uninitialized variables

Browse Source 
Refactoring for performance in 39097ea2da
caused border_width to be uninitialized when rendering border images.

https://bugzilla.gnome.org/show_bug.cgi?id=738483
This commit is contained in:
Benjamin Otte 2014-10-15 02:08:02 +02:00
parent c184bd4675
commit ccf6507f6a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkrender.c
View File

@ -894,10 +894,12 @@ render_frame_internal (GtkStyleContext *context,
GtkJunctionSides junction) GtkJunctionSides junction)
{ {
GtkBorderImage border_image; GtkBorderImage border_image;
GtkBorderStyle border_style[4];
GtkRoundedBox border_box;
double border_width[4]; double border_width[4];
GdkRGBA colors[4];
border_width[0] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
border_width[1] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
border_width[2] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
border_width[3] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
if (_gtk_border_image_init (&border_image, context)) if (_gtk_border_image_init (&border_image, context))
{ {
@ -905,10 +907,9 @@ render_frame_internal (GtkStyleContext *context,
} }
else else
{ {
border_width[0] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100); GtkBorderStyle border_style[4];
border_width[1] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100); GtkRoundedBox border_box;
border_width[2] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100); GdkRGBA colors[4];
border_width[3] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
/* Optimize the most common case of "This widget has no border" */ /* Optimize the most common case of "This widget has no border" */
if (border_width[0] == 0 && if (border_width[0] == 0 &&