Attachment 645982 Details for Bug 876685 – spice-server-0.12.0-4 for rhpkg (actual fix proposed)

[patch] spice-server-0.12.0-4 for rhpkg (actual fix proposed)

0002-spice-server-0.12.0-4.patch (text/plain), 2.98 KB, created by Alon Levy on 2012-11-15 20:53:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Levy

Created: 2012-11-15 20:53:47 UTC

Size: 2.98 KB

patch

obsolete

>From 2cae6b85daf33077a2f1a7de8012f1bb0d0cff4d Mon Sep 17 00:00:00 2001
>From: Alon Levy <alevy@redhat.com>
>Date: Thu, 15 Nov 2012 13:04:57 +0200
>Subject: [PATCH 2/2] spice-server-0.12.0-4
>
>---
> 0009-876685-test.patch | 27 +++++++++++++++++++++++++++
> spice-server.spec      |  8 +++++++-
> 2 files changed, 34 insertions(+), 1 deletion(-)
> create mode 100644 0009-876685-test.patch
>
>diff --git a/0009-876685-test.patch b/0009-876685-test.patch
>new file mode 100644
>index 0000000..288247f
>--- /dev/null
>+++ b/0009-876685-test.patch
>@@ -0,0 +1,27 @@
>+From 6776e5d3156f87862e1b4f2a083890a5170e1032 Mon Sep 17 00:00:00 2001
>+From: Alon Levy <alevy@redhat.com>
>+Date: Thu, 15 Nov 2012 13:01:35 +0200
>+Subject: [PATCH] 876685 test
>+
>+---
>+ spice-common/common/lz.c | 4 ++--
>+ 1 file changed, 2 insertions(+), 2 deletions(-)
>+
>+diff --git a/spice-common/common/lz.c b/spice-common/common/lz.c
>+index aca3a16..8015217 100644
>+--- a/spice-common/common/lz.c
>++++ b/spice-common/common/lz.c
>+@@ -520,8 +520,8 @@ int lz_encode(LzContext *lz, LzImageType type, int width, int height, int top_do
>+             }
>+         }
>+     } else {
>+-        if (encoder->stride != width * RGB_BYTES_PER_PIXEL[encoder->type]) {
>+-            encoder->usr->error(encoder->usr, "stride != width*bytes_per_pixel (rgb) %d != %d * %d (%d)\n",
>++        if (encoder->stride < width * RGB_BYTES_PER_PIXEL[encoder->type]) {
>++            encoder->usr->error(encoder->usr, "stride < width*bytes_per_pixel (rgb) %d < %d * %d (%d)\n",
>+                                 encoder->stride, width, RGB_BYTES_PER_PIXEL[encoder->type],
>+                                 encoder->type);
>+         }
>+-- 
>+1.8.0
>+
>diff --git a/spice-server.spec b/spice-server.spec
>index fdad047..6d6bff0 100644
>--- a/spice-server.spec
>+++ b/spice-server.spec
>@@ -3,7 +3,7 @@
> 
> Name:           spice-server
> Version:        0.12.0
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        Implements the server side of the SPICE protocol
> Group:          System Environment/Libraries
> License:        LGPLv2+
>@@ -20,6 +20,7 @@ Patch5: 0005-reds-Report-errors-from-load_dh_params.patch
> Patch6: 0006-reds-Check-errors-returned-from-SSL_CTX_set_cipher_l.patch
> Patch7: 0007-reds-Report-an-error-when-reds_char_device_add_state.patch
> Patch8: 0008-server-red_worker-don-t-call-set_client_capabilities.patch
>+Patch9: 0009-876685-test.patch
> 
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>@@ -84,6 +85,7 @@ using %{name}, you will need to install %{name}-devel.
> %patch6 -p1
> %patch7 -p1
> %patch8 -p1
>+%patch9 -p1
> 
> # no point of calling git-version-gen for spice-common and also
> # git-version-gen is missing in spice-common
>@@ -132,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Thu Nov 15 2012 Alon Levy <alevy@redhat.com> 0.12.0-4
>+- allow stride > width * bpp for lz_encode
>+- Resolves: rhbz#876685
>+
> * Thu Nov 15 2012 Alon Levy <alevy@redhat.com> 0.12.0-3
> - don't call set_client_capabilities if vm is stopped.
> - Resolves: rhbz#867405
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 876685: 645592 | 645982