nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix possible crashingness, from last commit.

Browse source
This commit is contained in:
Dana Jansens 2007-03-08 01:03:13 +00:00
parent a79651294c
commit b37a8b7e76
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
render/render.c
View file

@ -52,6 +52,14 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
/* ob_debug("Invalid parent co-ordinates\n"); */ /* ob_debug("Invalid parent co-ordinates\n"); */
return None; return None;
} }
if (a->surface.grad == RR_SURFACE_PARENTREL &&
(a->surface.parentx >= a->surface.parent->w ||
a->surface.parenty >= a->surface.parent->h))
{
return None;
}
resized = (a->w != w || a->h != h); resized = (a->w != w || a->h != h);
oldp = a->pixmap; /* save to free after changing the visible pixmap */ oldp = a->pixmap; /* save to free after changing the visible pixmap */
@ -79,10 +87,6 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
sw = a->surface.parent->w; sw = a->surface.parent->w;
sh = a->surface.parent->h; sh = a->surface.parent->h;
if (a->surface.parentx >= sw || a->surface.parenty >= sh) {
return oldp;
}
source = (a->surface.parent->surface.pixel_data + source = (a->surface.parent->surface.pixel_data +
a->surface.parentx + sw * a->surface.parenty); a->surface.parentx + sw * a->surface.parenty);
dest = a->surface.pixel_data; dest = a->surface.pixel_data;