aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-02-21 16:42:52 +0100
committerGerd Hoffmann <kraxel@redhat.com>2014-03-10 12:35:04 +0100
commit2e7bcdb99adbd8fc10ad9ddcf93bd2bf3c0f1f2d (patch)
treecafb54a850ceec1a0a29289ce76d993d6e67751a
parentf53f3d0a00b6df39ce8dfca942608e5b6a9a4f71 (diff)
downloadqemu-2e7bcdb99adbd8fc10ad9ddcf93bd2bf3c0f1f2d.zip
qemu-2e7bcdb99adbd8fc10ad9ddcf93bd2bf3c0f1f2d.tar.gz
qemu-2e7bcdb99adbd8fc10ad9ddcf93bd2bf3c0f1f2d.tar.bz2
vnc: Fix tight_detect_smooth_image() for lossless case
VncTight member uint8_t quality is either (uint8_t)-1 for lossless or less than 10 for lossy. tight_detect_smooth_image() first promotes it to int, then compares with -1. Always unequal, so we always execute the lossy code. Reads beyond tight_conf[] and returns crap when quality is actually lossless. Compare to (uint8_t)-1 instead, like we do elsewhere. Spotted by Coverity. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/vnc-enc-tight.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index e6966ae..59b59c0 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -330,7 +330,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h)
} else {
errors = tight_detect_smooth_image16(vs, w, h);
}
- if (quality != -1) {
+ if (quality != (uint8_t)-1) {
return (errors < tight_conf[quality].jpeg_threshold);
}
return (errors < tight_conf[compression].gradient_threshold);