summaryrefslogtreecommitdiffstats
path: root/server/red_channel.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-01-23 16:21:14 +0100
committerHans de Goede <hdegoede@redhat.com>2012-01-23 16:21:14 +0100
commit2f4115e52eeea3039a9e230d8c79ab42691a7dbf (patch)
tree3b5337f7baa7fcbf54c044171ecf705c7c077efd /server/red_channel.c
parentc05523462f2c63bfedf183d9fee6debbce6b6ac0 (diff)
parent8817549795722026ca83edab2640b8f156510074 (diff)
downloadspice-0.10.1.tar.gz
spice-0.10.1.tar.xz
spice-0.10.1.zip
Merge remote-tracking branch 'origin/master' into 0.100.10.1
Diffstat (limited to 'server/red_channel.c')
-rw-r--r--server/red_channel.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/server/red_channel.c b/server/red_channel.c
index e526179e..ec02018d 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -162,6 +162,12 @@ static void red_peer_handle_incoming(RedsStream *stream, IncomingHandler *handle
uint16_t msg_type;
uint32_t msg_size;
+ /* XXX: This needs further investigation as to the underlying cause, it happened
+ * after spicec disconnect (but not with spice-gtk) repeatedly. */
+ if (!stream) {
+ return;
+ }
+
for (;;) {
int ret_handle;
if (handler->header_pos < handler->header.header_size) {