[Spice-devel] [PATCH 2/2] server: red_send_image() - append image data to right marshaller

[Yonit Halperin]

On 08/26/2010 09:10 PM, alexl at redhat.com wrote:
> From: Alexander Larsson<alexl at redhat.com>
>
> 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.
> ---
>   server/red_worker.c |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/server/red_worker.c b/server/red_worker.c
> index da7e8e8..6589d7c 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -8017,7 +8017,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);

Ack