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

Fix bug: 'src_image' might be NULL if width||height are 0 (#3188223)

Browse source 
With ROT90-SystemTray fluxbox crashed. It is a bit unclear of where
to catch pixmaps / windows with either width or height equal to 0; IMHO
this needs more investigation.
This commit is contained in:
Mathias Gumz 2011-02-21 19:21:38 +01:00
parent ccb5ef6624
commit 341b2f43e5
1 changed files with 51 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/FbTk/FbPixmap.cc
View file

@ -218,61 +218,70 @@ void FbPixmap::rotate(FbTk::Orientation orient) {
unsigned int neww = oldw, newh = oldh; unsigned int neww = oldw, newh = oldh;
translateSize(orient, neww, newh); translateSize(orient, neww, newh);
// reverse height/width for new pixmap
FbPixmap new_pm(drawable(), neww, newh, depth());
// width|height could be 0. this happens (for example) if
// the systemtray-tool is ROT90. in that case 'src_image'
// becomes NULL and caused a SIGSEV upon XDestroyImage()
// TODO: catch dimensions with '0' earlier?
//
// make an image copy // make an image copy
XImage *src_image = XGetImage(display(), drawable(), XImage *src_image = XGetImage(display(), drawable(),
0, 0, // pos 0, 0, // pos
oldw, oldh, // size oldw, oldh, // size
~0, // plane mask ~0, // plane mask
ZPixmap); // format ZPixmap); // format
// reverse height/width for new pixmap if (src_image) {
FbPixmap new_pm(drawable(), neww, newh, depth());
GContext gc(drawable()); GContext gc(drawable());
if (orient == ROT180) { if (orient == ROT180) {
unsigned int srcx, srcy, destx, desty; unsigned int srcx, srcy, destx, desty;
for (srcy = 0, desty = oldh; srcy < oldh; ++srcy, --desty) { for (srcy = 0, desty = oldh; srcy < oldh; ++srcy, --desty) {
for (srcx = 0, destx = oldw; srcx < oldw; ++srcx, --destx) { for (srcx = 0, destx = oldw; srcx < oldw; ++srcx, --destx) {
gc.setForeground(XGetPixel(src_image, srcx, srcy)); gc.setForeground(XGetPixel(src_image, srcx, srcy));
XDrawPoint(display(), new_pm.drawable(), gc.gc(), destx, desty); XDrawPoint(display(), new_pm.drawable(), gc.gc(), destx, desty);
}
}
} else {
// need to flip x and y
// set start, end and direction based on rotation
// NOTE that startx etc are in the direction of the OLD pixmap
unsigned int startx = 0, starty = 0;
int dirx = 0, diry = 0;
switch (orient) {
case ROT90:
startx = neww-1;
starty = 0;
dirx = -1;
diry = 1;
break;
case ROT270:
startx = 0;
starty = newh-1;
dirx = 1;
diry = -1;
break;
default: // kill warning
break;
}
// copy new area
unsigned int srcx, srcy, destx, desty;
for (srcy = 0, destx = startx; srcy < oldh; ++srcy, destx+=dirx) {
for (srcx = 0, desty = starty; srcx < oldw; ++srcx, desty+=diry) {
gc.setForeground(XGetPixel(src_image, srcx, srcy));
XDrawPoint(display(), new_pm.drawable(), gc.gc(), destx, desty);
}
} }
} }
} else {
// need to flip x and y
// set start, end and direction based on rotation XDestroyImage(src_image);
// NOTE that startx etc are in the direction of the OLD pixmap
unsigned int startx = 0, starty = 0;
int dirx = 0, diry = 0;
switch (orient) {
case ROT90:
startx = neww-1;
starty = 0;
dirx = -1;
diry = 1;
break;
case ROT270:
startx = 0;
starty = newh-1;
dirx = 1;
diry = -1;
break;
default: // kill warning
break;
}
// copy new area
unsigned int srcx, srcy, destx, desty;
for (srcy = 0, destx = startx; srcy < oldh; ++srcy, destx+=dirx) {
for (srcx = 0, desty = starty; srcx < oldw; ++srcx, desty+=diry) {
gc.setForeground(XGetPixel(src_image, srcx, srcy));
XDrawPoint(display(), new_pm.drawable(), gc.gc(), destx, desty);
}
}
} }
XDestroyImage(src_image);
// free old pixmap and set new from new_pm // free old pixmap and set new from new_pm
free(); free();