some security fixes for fluxbox-remote, and a minor change for the gvim fix

1 files changed, 12 insertions, 7 deletions

diff --git a/src/Window.cc b/src/Window.cc
index f6fe225..1bfab7f 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2564,13 +2564,18 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
     int cx = frame().x(), cy = frame().y(), ignore = 0;
     unsigned int cw = frame().width(), ch = frame().height();
 
-    // if this is not m_client and m_client has resize_inc, make sure the new
-    // size would be ok with m_client
-    if (client != m_client && cr.value_mask & CWWidth &&
-        cr.value_mask & CWHeight &&
-        !m_client->checkSizeHints(cr.width, cr.height)) {
-        sendConfigureNotify();
-        return;
+    // make sure the new width/height would be ok with all clients, or else they
+    // could try to resize the window back and forth
+    if (client != m_client &&
+        cr.value_mask & CWWidth && cr.value_mask & CWHeight) {
+        ClientList::iterator it = clientList().begin();
+        ClientList::iterator it_end = clientList().end();
+        for (; it != it_end; ++it) {
+            if (!m_client->checkSizeHints(cr.width, cr.height)) {
+                sendConfigureNotify();
+                return;
+            }
+        }
     }
 
     if (cr.value_mask & CWBorderWidth)