|
 |
828eab1 |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
828eab1 |
Date: Thu, 3 Dec 2015 18:54:17 +0530
|
|
|
828eab1 |
Subject: [PATCH] ui: vnc: avoid floating point exception
|
|
|
828eab1 |
|
|
|
828eab1 |
While sending 'SetPixelFormat' messages to a VNC server,
|
|
|
828eab1 |
the client could set the 'red-max', 'green-max' and 'blue-max'
|
|
|
828eab1 |
values to be zero. This leads to a floating point exception in
|
|
|
828eab1 |
write_png_palette while doing frame buffer updates.
|
|
|
828eab1 |
|
|
|
828eab1 |
Reported-by: Lian Yihan <lianyihan@360.cn>
|
|
|
828eab1 |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
828eab1 |
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
828eab1 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
828eab1 |
(cherry picked from commit 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3)
|
|
|
828eab1 |
---
|
|
|
828eab1 |
ui/vnc.c | 6 +++---
|
|
|
828eab1 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
828eab1 |
|
|
|
828eab1 |
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
|
828eab1 |
index caf82f5..52c6809 100644
|
|
|
828eab1 |
--- a/ui/vnc.c
|
|
|
828eab1 |
+++ b/ui/vnc.c
|
|
|
828eab1 |
@@ -2189,15 +2189,15 @@ static void set_pixel_format(VncState *vs,
|
|
|
828eab1 |
return;
|
|
|
828eab1 |
}
|
|
|
828eab1 |
|
|
|
828eab1 |
- vs->client_pf.rmax = red_max;
|
|
|
828eab1 |
+ vs->client_pf.rmax = red_max ? red_max : 0xFF;
|
|
|
828eab1 |
vs->client_pf.rbits = hweight_long(red_max);
|
|
|
828eab1 |
vs->client_pf.rshift = red_shift;
|
|
|
828eab1 |
vs->client_pf.rmask = red_max << red_shift;
|
|
|
828eab1 |
- vs->client_pf.gmax = green_max;
|
|
|
828eab1 |
+ vs->client_pf.gmax = green_max ? green_max : 0xFF;
|
|
|
828eab1 |
vs->client_pf.gbits = hweight_long(green_max);
|
|
|
828eab1 |
vs->client_pf.gshift = green_shift;
|
|
|
828eab1 |
vs->client_pf.gmask = green_max << green_shift;
|
|
|
828eab1 |
- vs->client_pf.bmax = blue_max;
|
|
|
828eab1 |
+ vs->client_pf.bmax = blue_max ? blue_max : 0xFF;
|
|
|
828eab1 |
vs->client_pf.bbits = hweight_long(blue_max);
|
|
|
828eab1 |
vs->client_pf.bshift = blue_shift;
|
|
|
828eab1 |
vs->client_pf.bmask = blue_max << blue_shift;
|