Fix possible crashingness, from last commit.
Dana Jansens danakj@orodu.net
1 files changed,
8 insertions(+),
4 deletions(-)
jump to
M
render/render.c
→
render/render.c
@@ -52,6 +52,14 @@ if (a->surface.parentx < 0 || a->surface.parenty < 0) {
/* ob_debug("Invalid parent co-ordinates\n"); */ 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); oldp = a->pixmap; /* save to free after changing the visible pixmap */@@ -78,10 +86,6 @@ g_assert (a->surface.parent->w);
sw = a->surface.parent->w; sh = a->surface.parent->h; - - if (a->surface.parentx >= sw || a->surface.parenty >= sh) { - return oldp; - } source = (a->surface.parent->surface.pixel_data + a->surface.parentx + sw * a->surface.parenty);