Patchwork [v2,09/15] vnc: fix uint8_t comparisons with negative values

login
register
mail settings
Submitter Corentin Chary
Date Nov. 11, 2010, 4:56 p.m.
Message ID <1289494624-12807-10-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/70842/
State New
Headers show

Comments

Corentin Chary - Nov. 11, 2010, 4:56 p.m.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 ui/vnc-enc-tight.c |    4 ++--
 ui/vnc-enc-zrle.c  |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index ad9a9a8..81024d5 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -1546,7 +1546,7 @@  static int send_sub_rect(VncState *vs, int x, int y, int w, int h)
     vnc_tight_stop(vs);
 
 #ifdef CONFIG_VNC_JPEG
-    if (vs->tight.quality != -1) {
+    if (vs->tight.quality != (uint8_t)-1) {
         double freq = vnc_update_freq(vs, x, y, w, h);
 
         if (freq < tight_jpeg_conf[vs->tight.quality].jpeg_freq_min) {
@@ -1711,7 +1711,7 @@  static int tight_send_framebuffer_update(VncState *vs, int x, int y,
         vs->tight.pixel24 = false;
     }
 
-    if (vs->tight.quality != -1) {
+    if (vs->tight.quality != (uint8_t)-1) {
         double freq = vnc_update_freq(vs, x, y, w, h);
 
         if (freq > tight_jpeg_conf[vs->tight.quality].jpeg_freq_threshold) {
diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c
index 4460890..b5a245a 100644
--- a/ui/vnc-enc-zrle.c
+++ b/ui/vnc-enc-zrle.c
@@ -284,7 +284,8 @@  static int zrle_send_framebuffer_update(VncState *vs, int x, int y,
   int zywrle_level;
 
   if (vs->zrle.type == VNC_ENCODING_ZYWRLE) {
-      if (!vs->vd->lossy || vs->tight.quality < 0 || vs->tight.quality == 9) {
+      if (!vs->vd->lossy || vs->tight.quality == (uint8_t)-1
+          || vs->tight.quality == 9) {
           zywrle_level = 0;
           vs->zrle.type = VNC_ENCODING_ZRLE;
       } else if (vs->tight.quality < 3) {