summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-08-26 20:10:34 +0200
committerAlexander Larsson <alexl@redhat.com>2010-08-27 11:19:20 +0200
commit250203951bc02528d821fa775949edd09b8c6d8c (patch)
treee291b50fa6a19b7cbd5b2772a9daaa36a20a15e8
parentc13f931b5f2df1938547f3d3e7f5d848a7137b5f (diff)
downloadspice-250203951bc02528d821fa775949edd09b8c6d8c.tar.gz
spice-250203951bc02528d821fa775949edd09b8c6d8c.tar.xz
spice-250203951bc02528d821fa775949edd09b8c6d8c.zip
server: red_send_image() - append image data to right marshaller
The actual bitmap data was added to the main marshaller rather than the submarshaller that pointed to the SpiceImage part. This made us send too short messages failing demarshalling in the client.
-rw-r--r--server/red_worker.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index c39bdf0f..173ee65c 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -7957,7 +7957,8 @@ static void red_send_image(DisplayChannel *display_channel, ImageItem *item)
spice_marshall_Image(src_bitmap_out, &red_image,
&bitmap_palette_out, &lzplt_palette_out);
- spice_marshaller_add_ref(m, item->data, bitmap.y * bitmap.stride);
+ spice_marshaller_add_ref(src_bitmap_out, item->data,
+ bitmap.y * bitmap.stride);
region_remove(surface_lossy_region, &copy.base.box);
}
display_begin_send_message(display_channel, &item->link);