all repos — fluxbox @ 86031f9c75d7dada8fd61e5a0059d54fa42ce099

custom fork of the fluxbox windowmanager

don't create gigantic images when XGetGeometry fails in FbTk::FbPixmap::copy
markt markt
commit

86031f9c75d7dada8fd61e5a0059d54fa42ce099

parent

2ddc0290cb7bed695afab3ca7e8b130b76e66793

2 files changed, 11 insertions(+), 7 deletions(-)

jump to
M ChangeLogChangeLog

@@ -1,5 +1,8 @@

(Format: Year/Month/Day) Changes for 1.0.0: +*07/07/03: + * Fixed resource usage due to Skype 1.4, bug #1745678 (Mark) + FbTk/FbPixmap.cc *07/07/02: * Remember original size/position in apps file for shaded or maximized windows (Mark)
M src/FbTk/FbPixmap.ccsrc/FbTk/FbPixmap.cc

@@ -166,13 +166,14 @@ int x, y;

unsigned int border_width, bpp; unsigned int new_width, new_height; - XGetGeometry(display(), - pm, - &root, - &x, &y, - &new_width, &new_height, - &border_width, - &bpp); + if (!XGetGeometry(display(), + pm, + &root, + &x, &y, + &new_width, &new_height, + &border_width, + &bpp)) + return; if (depth == 0) depth = bpp;