pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-27 15:45:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: don't crash when booting a Xinerama setup

Browse Source 
In a Xinerama setup, when X starts up and creates one of the
secondary screens, first a non-primary surface is created on the
secondary screen, and then the primary surface for this screen is
created.
This causes a crash when the guest uses Xinerama and the client
is attached to the VM before X starts (ie while the guest is
booting).
This happens because DisplayChannel::create_canvas (which is called
when creating a non-primary surface) assumes a screen has already been
set for the DisplayChannel while this only happens upon primary surface
creation. However, it uses the screen for non important stuff, so we
can test if screen() is non NULL before using it. This is what is done
in other parts of this file.

Fixes rhbz #732423
This commit is contained in:
Christophe Fergeau 2011-09-16 08:56:38 +02:00
parent d8e7839054
commit b353c8e04f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/display_channel.cpp
View File

@ -1162,13 +1162,15 @@ void DisplayChannel::create_canvas(int surface_id, const std::vector<int>& canva
#endif
unsigned int i;
if (screen()) {
#ifdef USE_OGL
if (screen()->need_recreate_context_gl()) {
recreate = false;
}
if (screen()->need_recreate_context_gl()) {
recreate = false;
}
#endif
screen()->set_update_interrupt_trigger(NULL);
screen()->set_update_interrupt_trigger(NULL);
}
for (i = 0; i < canvas_types.size(); i++) {