pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-12 17:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server/reds: allow call to reds_agent_remove even if it is gone

Browse Source 
The current assert(reds->agent_state.connected) tiggers if when
the agent disconnected there was still data waiting to be sent (for
instance if there is a bug in the client handling clipboard and it
is killed while a large clipboard transfer is in progress). So first
call to reds_agent_remove happens from spice_server_char_device_remove_interface,
and then it is called again (triggering the assert) from free_item_data
from read_from_vdi_port because of the channel destruction.

Other option would be to not call it from one of the paths - but that
is suboptimal:
 * if there is no data in the pipe, the second call never happens.
 * the second call has to be there anyway, because it may fail during
  parsing data from the agent.

This patch fixes a segfault on this assert when a client starts passing
from guest agent to client a large clipboard and dies in the middle. There
is still another assert happening occasionally at marshaller which I don't
have a fix for (but it doesn't seem to be related).
This commit is contained in:
Alon Levy 2011-03-04 13:15:26 +02:00
parent 1af83642c1
commit 61d8e54766
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/reds.c
View File

@ -699,7 +699,9 @@ static void reds_agent_remove()
SpiceCharDeviceInstance *sin = vdagent;
SpiceCharDeviceInterface *sif;
ASSERT(reds->agent_state.connected)
if (!reds->agent_state.connected) {
return;
}
reds->agent_state.connected = 0;
vdagent = NULL;
reds_update_mouse_mode();