Make sure we always have a valid screen layout
Add more checks and fix some callers to make sure that the server
core always has a valid screen layout configured.
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index 8cc04f7..a9ae62e 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -305,8 +305,6 @@
delete comparer;
comparer = 0;
- screenLayout = layout;
-
if (!pb) {
screenLayout = ScreenSet();
@@ -316,16 +314,17 @@
return;
}
+ if (!layout.validate(pb->width(), pb->height()))
+ throw Exception("setPixelBuffer: invalid screen layout");
+
+ screenLayout = layout;
+
// Assume the framebuffer contents wasn't saved and reset everything
// that tracks its contents
comparer = new ComparingUpdateTracker(pb);
renderedCursorInvalid = true;
add_changed(pb->getRect());
- // Make sure that we have at least one screen
- if (screenLayout.num_screens() == 0)
- screenLayout.add_screen(Screen(0, 0, 0, pb->width(), pb->height(), 0));
-
std::list<VNCSConnectionST*>::iterator ci, ci_next;
for (ci=clients.begin();ci!=clients.end();ci=ci_next) {
ci_next = ci; ci_next++;
@@ -359,6 +358,10 @@
}
}
+ // Make sure that we have at least one screen
+ if (layout.num_screens() == 0)
+ layout.add_screen(Screen(0, 0, 0, pb->width(), pb->height(), 0));
+
setPixelBuffer(pb_, layout);
}
diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index f8b579d..e77e765 100644
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -397,6 +397,11 @@
}
#endif
+ // Make sure that we have at least one screen
+ if (layout.num_screens() == 0)
+ layout.add_screen(rfb::Screen(0, 0, 0, geometry->width(),
+ geometry->height(), 0));
+
return layout;
}