Mesa (master): vl: Fix inverted logic in vlc checks

Christian König deathsimple at kemper.freedesktop.org
Sat Dec 24 14:44:23 UTC 2011


Module: Mesa
Branch: master
Commit: 1fdecef8868ce1a5ca6c2cb260294fb37d3bd69d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fdecef8868ce1a5ca6c2cb260294fb37d3bd69d

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Sat Dec 24 12:33:30 2011 +0100

vl: Fix inverted logic in vlc checks

Reported-by: Andy Furniss <andyqos at ukfsn.org>
Signed-off-by: Maarten Lankhorst <m.b.lankhorst at gmail.com>

---

 src/gallium/auxiliary/vl/vl_vlc.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/vl/vl_vlc.h b/src/gallium/auxiliary/vl/vl_vlc.h
index ff0c4b5..baaa48a 100644
--- a/src/gallium/auxiliary/vl/vl_vlc.h
+++ b/src/gallium/auxiliary/vl/vl_vlc.h
@@ -215,7 +215,7 @@ vl_vlc_bits_left(struct vl_vlc *vlc)
 static INLINE unsigned
 vl_vlc_peekbits(struct vl_vlc *vlc, unsigned num_bits)
 {
-   assert(vl_vlc_valid_bits(vlc) <= num_bits || vlc->data >= vlc->end);
+   assert(vl_vlc_valid_bits(vlc) >= num_bits || vlc->data >= vlc->end);
    return vlc->buffer >> (64 - num_bits);
 }
 
@@ -225,7 +225,7 @@ vl_vlc_peekbits(struct vl_vlc *vlc, unsigned num_bits)
 static INLINE void
 vl_vlc_eatbits(struct vl_vlc *vlc, unsigned num_bits)
 {
-   assert(vl_vlc_valid_bits(vlc) <= num_bits);
+   assert(vl_vlc_valid_bits(vlc) >= num_bits);
 
    vlc->buffer <<= num_bits;
    vlc->invalid_bits += num_bits;
@@ -239,7 +239,7 @@ vl_vlc_get_uimsbf(struct vl_vlc *vlc, unsigned num_bits)
 {
    unsigned value;
 
-   assert(vl_vlc_valid_bits(vlc) <= num_bits);
+   assert(vl_vlc_valid_bits(vlc) >= num_bits);
 
    value = vlc->buffer >> (64 - num_bits);
    vl_vlc_eatbits(vlc, num_bits);
@@ -255,7 +255,7 @@ vl_vlc_get_simsbf(struct vl_vlc *vlc, unsigned num_bits)
 {
    signed value;
 
-   assert(vl_vlc_valid_bits(vlc) <= num_bits);
+   assert(vl_vlc_valid_bits(vlc) >= num_bits);
 
    value = ((int64_t)vlc->buffer) >> (64 - num_bits);
    vl_vlc_eatbits(vlc, num_bits);




More information about the mesa-commit mailing list