[trunk] Prevent a leak when reading PPT markers

[openjpeg.git] / src / lib / openjp2 / mqc.c

diff --git a/src/lib/openjp2/mqc.c b/src/lib/openjp2/mqc.c
index 7e554bbcc88093ff0baae4ab56cc273bd57df0d3..677884c3c3f3334dfbc4ae3f256e1acefc451568 100644 (file)
--- a/src/lib/openjp2/mqc.c
+++ b/src/lib/openjp2/mqc.c
@@ -199,13 +199,13 @@ static opj_mqc_state_t mqc_states[47 * 2] = {
 void opj_mqc_byteout(opj_mqc_t *mqc) {
        if (*mqc->bp == 0xff) {
                mqc->bp++;
-               *mqc->bp = mqc->c >> 20;
+               *mqc->bp = (OPJ_BYTE)(mqc->c >> 20);
                mqc->c &= 0xfffff;
                mqc->ct = 7;
        } else {
                if ((mqc->c & 0x8000000) == 0) {        /* ((mqc->c&0x8000000)==0) CHANGE */
                        mqc->bp++;
-                       *mqc->bp = mqc->c >> 19;
+                       *mqc->bp = (OPJ_BYTE)(mqc->c >> 19);
                        mqc->c &= 0x7ffff;
                        mqc->ct = 8;
                } else {
@@ -213,12 +213,12 @@ void opj_mqc_byteout(opj_mqc_t *mqc) {
                        if (*mqc->bp == 0xff) {
                                mqc->c &= 0x7ffffff;
                                mqc->bp++;
-                               *mqc->bp = mqc->c >> 20;
+                               *mqc->bp = (OPJ_BYTE)(mqc->c >> 20);
                                mqc->c &= 0xfffff;
                                mqc->ct = 7;
                        } else {
                                mqc->bp++;
-                               *mqc->bp = mqc->c >> 19;
+                               *mqc->bp = (OPJ_BYTE)(mqc->c >> 19);
                                mqc->c &= 0x7ffff;
                                mqc->ct = 8;
                        }
@@ -274,10 +274,10 @@ void opj_mqc_setbits(opj_mqc_t *mqc) {
 static INLINE OPJ_INT32 opj_mqc_mpsexchange(opj_mqc_t *const mqc) {
        OPJ_INT32 d;
        if (mqc->a < (*mqc->curctx)->qeval) {
-               d = 1 - (*mqc->curctx)->mps;
+               d = (OPJ_INT32)(1 - (*mqc->curctx)->mps);
                *mqc->curctx = (*mqc->curctx)->nlps;
        } else {
-               d = (*mqc->curctx)->mps;
+               d = (OPJ_INT32)(*mqc->curctx)->mps;
                *mqc->curctx = (*mqc->curctx)->nmps;
        }
        
@@ -288,11 +288,11 @@ static INLINE OPJ_INT32 opj_mqc_lpsexchange(opj_mqc_t *const mqc) {
        OPJ_INT32 d;
        if (mqc->a < (*mqc->curctx)->qeval) {
                mqc->a = (*mqc->curctx)->qeval;
-               d = (*mqc->curctx)->mps;
+               d = (OPJ_INT32)(*mqc->curctx)->mps;
                *mqc->curctx = (*mqc->curctx)->nmps;
        } else {
                mqc->a = (*mqc->curctx)->qeval;
-               d = 1 - (*mqc->curctx)->mps;
+               d = (OPJ_INT32)(1 - (*mqc->curctx)->mps);
                *mqc->curctx = (*mqc->curctx)->nlps;
        }
        
@@ -371,7 +371,11 @@ void opj_mqc_destroy(opj_mqc_t *mqc) {
 }
 
 OPJ_UINT32 opj_mqc_numbytes(opj_mqc_t *mqc) {
-       return mqc->bp - mqc->start;
+       const ptrdiff_t diff = mqc->bp - mqc->start;
+#if 0
+  assert( diff <= 0xffffffff && diff >= 0 ); /* UINT32_MAX */
+#endif
+       return (OPJ_UINT32)diff;
 }
 
 void opj_mqc_init_enc(opj_mqc_t *mqc, OPJ_BYTE *bp) {
@@ -420,7 +424,7 @@ void opj_mqc_bypass_enc(opj_mqc_t *mqc, OPJ_UINT32 d) {
        mqc->c = mqc->c + (d << mqc->ct);
        if (mqc->ct == 0) {
                mqc->bp++;
-               *mqc->bp = mqc->c;
+               *mqc->bp = (OPJ_BYTE)mqc->c;
                mqc->ct = 8;
                if (*mqc->bp == 0xff) {
                        mqc->ct = 7;
@@ -437,11 +441,11 @@ OPJ_UINT32 opj_mqc_bypass_flush_enc(opj_mqc_t *mqc) {
        if (mqc->ct != 0) {
                while (mqc->ct > 0) {
                        mqc->ct--;
-                       mqc->c += bit_padding << mqc->ct;
+                       mqc->c += (OPJ_UINT32)(bit_padding << mqc->ct);
                        bit_padding = (bit_padding + 1) & 0x01;
                }
                mqc->bp++;
-               *mqc->bp = mqc->c;
+               *mqc->bp = (OPJ_BYTE)mqc->c;
                mqc->ct = 8;
                mqc->c = 0;
        }
@@ -460,11 +464,11 @@ OPJ_UINT32 opj_mqc_restart_enc(opj_mqc_t *mqc) {
        OPJ_UINT32 correction = 1;
        
        /* <flush part> */
-       OPJ_INT32 n = 27 - 15 - mqc->ct;
+       OPJ_INT32 n = (OPJ_INT32)(27 - 15 - mqc->ct);
        mqc->c <<= mqc->ct;
        while (n > 0) {
                opj_mqc_byteout(mqc);
-               n -= mqc->ct;
+               n -= (OPJ_INT32)mqc->ct;
                mqc->c <<= mqc->ct;
        }
        opj_mqc_byteout(mqc);
@@ -485,13 +489,13 @@ void opj_mqc_restart_init_enc(opj_mqc_t *mqc) {
 }
 
 void opj_mqc_erterm_enc(opj_mqc_t *mqc) {
-       OPJ_INT32 k = 11 - mqc->ct + 1;
+       OPJ_INT32 k = (OPJ_INT32)(11 - mqc->ct + 1);
        
        while (k > 0) {
                mqc->c <<= mqc->ct;
                mqc->ct = 0;
                opj_mqc_byteout(mqc);
-               k -= mqc->ct;
+               k -= (OPJ_INT32)mqc->ct;
        }
        
        if (*mqc->bp != 0xff) {
@@ -508,13 +512,13 @@ void opj_mqc_segmark_enc(opj_mqc_t *mqc) {
        }
 }
 
-opj_bool opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
+OPJ_BOOL opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
        opj_mqc_setcurctx(mqc, 0);
        mqc->start = bp;
        mqc->end = bp + len;
        mqc->bp = bp;
        if (len==0) mqc->c = 0xff << 16;
-       else mqc->c = *mqc->bp << 16;
+       else mqc->c = (OPJ_UINT32)(*mqc->bp << 16);
 
 #ifdef MQC_PERF_OPT /* TODO_MSD: check this option and put in experimental */
        {
@@ -579,7 +583,7 @@ OPJ_INT32 opj_mqc_decode(opj_mqc_t *const mqc) {
                        d = opj_mqc_mpsexchange(mqc);
                        opj_mqc_renormd(mqc);
                } else {
-                       d = (*mqc->curctx)->mps;
+                       d = (OPJ_INT32)(*mqc->curctx)->mps;
                }
        }
 
@@ -594,7 +598,7 @@ void opj_mqc_resetstates(opj_mqc_t *mqc) {
 }
 
 void opj_mqc_setstate(opj_mqc_t *mqc, OPJ_UINT32 ctxno, OPJ_UINT32 msb, OPJ_INT32 prob) {
-       mqc->ctxs[ctxno] = &mqc_states[msb + (prob << 1)];
+       mqc->ctxs[ctxno] = &mqc_states[msb + (OPJ_UINT32)(prob << 1)];
 }