brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme-node-drawing: don't crash if st_theme_node_paint() is called on an empty area

Browse Source 
When st_theme_node_paint() was called with zero width or height and a theme
node with a shadow, we'd crash because we'd fail to allocate a texture with
an empty size, then unreference the NULL pointer.

https://bugzilla.redhat.com/show_bug.cgi?id=748293
https://bugzilla.gnome.org/show_bug.cgi?id=668050
This commit is contained in:
Owen W. Taylor 2012-01-16 14:50:47 -05:00
parent 91ca86ffe4
commit e58c82fc04
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/st/st-theme-node-drawing.c
View File

@ -1306,6 +1306,8 @@ st_theme_node_render_resources (StThemeNode *node,
StShadow *background_image_shadow_spec; StShadow *background_image_shadow_spec;
const char *background_image; const char *background_image;
g_return_if_fail (width > 0 && height > 0);
texture_cache = st_texture_cache_get_default (); texture_cache = st_texture_cache_get_default ();
/* FIXME - need to separate this into things that need to be recomputed on /* FIXME - need to separate this into things that need to be recomputed on
@ -1409,9 +1411,11 @@ st_theme_node_render_resources (StThemeNode *node,
else if (node->background_color.alpha > 0 || has_border) else if (node->background_color.alpha > 0 || has_border)
{ {
CoglHandle buffer, offscreen; CoglHandle buffer, offscreen;
int texture_width = ceil (width);
int texture_height = ceil (height);
buffer = cogl_texture_new_with_size (width, buffer = cogl_texture_new_with_size (texture_width,
height, texture_height,
COGL_TEXTURE_NO_SLICING, COGL_TEXTURE_NO_SLICING,
COGL_PIXEL_FORMAT_ANY); COGL_PIXEL_FORMAT_ANY);
offscreen = cogl_offscreen_new_to_texture (buffer); offscreen = cogl_offscreen_new_to_texture (buffer);
@ -1925,6 +1929,9 @@ st_theme_node_paint (StThemeNode *node,
allocation.x2 = width; allocation.x2 = width;
allocation.y2 = height; allocation.y2 = height;
if (width <= 0 || height <= 0)
return;
if (node->alloc_width != width || node->alloc_height != height) if (node->alloc_width != width || node->alloc_height != height)
st_theme_node_render_resources (node, width, height); st_theme_node_render_resources (node, width, height);