X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fio%2Fcodebook.rs;h=78ef5ae0d142164106696f478916905da2514477;hb=b74ff9fac35d41737d71d97227fad233aa4a4b49;hp=5bfd71991e186cfe7c855d2ce11411e1d27d8a59;hpb=6465a94691189acfc2fc2909e6e24442a1f0b700;p=nihav.git

diff --git a/src/io/codebook.rs b/src/io/codebook.rs
index 5bfd719..78ef5ae 100644
--- a/src/io/codebook.rs
+++ b/src/io/codebook.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::cmp::{max, min};
-use io::bitreader::BitReader;
+use super::bitreader::BitReader;
 
 #[derive(Debug)]
 pub enum CodebookError {
@@ -195,7 +195,12 @@ impl<S: Copy> Codebook<S> {
         let mut symidx: usize = 0;
         for i in 0..cb.len() {
             let bits = cb.bits(i);
-            if bits > 0 { nnz = nnz + 1; }
+            if bits > 0 {
+                nnz = nnz + 1;
+                if cb.code(i) >= (1 << bits) {
+                    return Err(CodebookError::InvalidCodebook);
+                }
+            }
             maxbits = max(bits, maxbits);
             if bits > MAX_LUT_BITS {
                 let code = cb.code(i);
@@ -331,7 +336,7 @@ impl<CodeType: Copy+Into<u32>, IndexType> CodebookDescReader<IndexType> for Tabl
 #[cfg(test)]
 mod test {
     use super::*;
-    use io::bitreader::*;
+    use crate::io::bitreader::*;
 
     #[test]
     fn test_cb() {