Ticket #21741: patch-src-adpcm.c.diff

src/adpcm.c

@@ -149 +148 @@
                 top = obuff + n*chans;
 
                 ch = 0;
-                while (op < top) {
+    while (op < top) { /*** N.B. Without int casts, crashes on 64-bit arch ***/
                         b = *ip++;
                         tmp = op;
-                        *op++ = AdpcmDecode(b >> 4, state+ch, tmp[-chans], tmp[-(2*chans)]);
+      *op++ = AdpcmDecode(b >> 4, state+ch, tmp[-(int)chans], tmp[-(int)(2*chans)]);
                         if (++ch == chans) ch = 0;
-                        /* ch = ++ch % chans; */
                         tmp = op;
-                        *op++ = AdpcmDecode(b&0x0f, state+ch, tmp[-chans], tmp[-(2*chans)]);
+      *op++ = AdpcmDecode(b&0x0f, state+ch, tmp[-(int)chans], tmp[-(int)(2*chans)]);
                         if (++ch == chans) ch = 0;
-                        /* ch = ++ch % chans; */
                 }
         }
         return errmsg;