OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: misc bugfixes.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJXhJrAAAoJEEy22O7T6HE4KDsQAMweZGj0+h4Wv7PERMzGsxNJ
 eTtyKphqls0JKMBy4ChMgJeJ0d5pJdUiN2aQb3GaxkrpvC2Sfb+8TCc7uTHgybPW
 tCcfuN5k6nX7k7p6q8NG7ojGnO1Wu8n4j9pn1AqlRx9u/XBg4RCw47JoHapxLXZE
 D+GjlWqKfV6vQvE9frTt9fmtoA4pFMBTKxDRoUY6mD0D3ujxkqCVh695HYORZ59q
 Za8EGmaACnlPdqQhXBUJgJuvMjAdRd0A2JCr2L4KMs7ze6ONV+N/JVuEMk/ZAfLQ
 7vQ7kjhKEuNAWFC4oATXAYvFuyW1bvSr2cJ4mYwZvH70Bh1JFqXjAEXVINKwvKIw
 s5YTH1Z2JSL32cgLKM743nVRJfzbpp6U+6S4eKxOQVmoyEkJW9AsUST1wheF6ZkR
 yD1oVS60dHJ0Wn5JAaPpHPABIroUgpOGHJS4yHyvUfKyR8PO54fpSHaRsu3xTaa5
 I2fWiaIxn7GfHbXonPWd8ob31ElqwR5VM/Lb1zBNi092/ku8Wk8DCuhESy8FEqHF
 gx0Dzsr6naO1hoY/ktNSxzbXcEvtK4CEt2T0kM4ai9gScWaKbv/y5jiIJFapaarN
 EjpjA8rlcNlP2lc+JN9l8v/d6bg1Fnc8X88TB1m0w3l6s4OkjB3sITVK8tHOXQxF
 r15TR7g1t1Xa5GKAuDgC
 =dh+b
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160712-1' into staging

vnc: misc bugfixes.

# gpg: Signature made Tue 12 Jul 2016 08:22:40 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-vnc-20160712-1:
  ui: avoid crash if vnc client disconnects with writes pending
  vnc-enc-tight: use thread local storage for palette
  vnc: fix incorrect checking condition when updating client

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-12 09:49:04 +01:00
commit 910789c220
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/vnc-enc-tight.c
View File

@ -349,7 +349,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
tight_fill_palette##bpp(VncState *vs, int x, int y, \
int max, size_t count, \
uint32_t *bg, uint32_t *fg, \
VncPalette **palette) { \
VncPalette *palette) { \
uint##bpp##_t *data; \
uint##bpp##_t c0, c1, ci; \
int i, n0, n1; \
@ -396,23 +396,23 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
return 0; \
} \
\
*palette = palette_new(max, bpp); \
palette_put(*palette, c0); \
palette_put(*palette, c1); \
palette_put(*palette, ci); \
palette_init(palette, max, bpp); \
palette_put(palette, c0); \
palette_put(palette, c1); \
palette_put(palette, ci); \
\
for (i++; i < count; i++) { \
if (data[i] == ci) { \
continue; \
} else { \
ci = data[i]; \
if (!palette_put(*palette, (uint32_t)ci)) { \
if (!palette_put(palette, (uint32_t)ci)) { \
return 0; \
} \
} \
} \
\
return palette_size(*palette); \
return palette_size(palette); \
}
DEFINE_FILL_PALETTE_FUNCTION(8)
@ -421,7 +421,7 @@ DEFINE_FILL_PALETTE_FUNCTION(32)
static int tight_fill_palette(VncState *vs, int x, int y,
size_t count, uint32_t *bg, uint32_t *fg,
VncPalette **palette)
VncPalette *palette)
{
int max;
@ -1457,9 +1457,11 @@ static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h,
}
#endif
static __thread VncPalette color_count_palette;
static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
{
VncPalette *palette = NULL;
VncPalette *palette = &color_count_palette;
uint32_t bg = 0, fg = 0;
int colors;
int ret = 0;
@ -1488,7 +1490,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
}
#endif
colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, &palette);
colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, palette);
#ifdef CONFIG_VNC_JPEG
if (allow_jpeg && vs->tight.quality != (uint8_t)-1) {
@ -1501,7 +1503,6 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
ret = send_sub_rect_nojpeg(vs, x, y, w, h, bg, fg, colors, palette);
#endif
palette_destroy(palette);
return ret;
}

15
ui/vnc.c
View File

@ -1025,7 +1025,7 @@ static int find_and_clear_dirty_height(VncState *vs,
static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
{
vs->has_dirty += has_dirty;
if (vs->need_update && vs->ioc != NULL) {
if (vs->need_update && !vs->disconnecting) {
VncDisplay *vd = vs->vd;
VncJob *job;
int y;
@ -1436,8 +1436,9 @@ static void vnc_jobs_bh(void *opaque)
* First function called whenever there is more data to be read from
* the client socket. Will delegate actual work according to whether
* SASL SSF layers are enabled (thus requiring decryption calls)
* Returns 0 on success, -1 if client disconnected
*/
static void vnc_client_read(VncState *vs)
static int vnc_client_read(VncState *vs)
{
ssize_t ret;
@ -1450,8 +1451,9 @@ static void vnc_client_read(VncState *vs)
if (!ret) {
if (vs->disconnecting) {
vnc_disconnect_finish(vs);
return -1;
}
return;
return 0;
}
while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) {
@ -1461,7 +1463,7 @@ static void vnc_client_read(VncState *vs)
ret = vs->read_handler(vs, vs->input.buffer, len);
if (vs->disconnecting) {
vnc_disconnect_finish(vs);
return;
return -1;
}
if (!ret) {
@ -1470,6 +1472,7 @@ static void vnc_client_read(VncState *vs)
vs->read_handler_expect = ret;
}
}
return 0;
}
gboolean vnc_client_io(QIOChannel *ioc G_GNUC_UNUSED,
@ -1477,7 +1480,9 @@ gboolean vnc_client_io(QIOChannel *ioc G_GNUC_UNUSED,
{
VncState *vs = opaque;
if (condition & G_IO_IN) {
vnc_client_read(vs);
if (vnc_client_read(vs) < 0) {
return TRUE;
}
}
if (condition & G_IO_OUT) {
vnc_client_write(vs);