shithub: opus

Download patch

ref: 259e166648832ba5bf4ed4d08aca87e8f5e8fe5c
parent: 54f7cb46291a4f5989a1515a4f092d40759bfd2b
author: Jean-Marc Valin <[email protected]>
date: Mon Dec 3 08:05:24 EST 2012 

Fix packet length handling for 16-bit machines (makes no difference on 32-bit)


--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -589,7 +589,7 @@
    int cbr;
    unsigned char ch, toc;
    int framesize;
-   int last_size;
+   opus_int32 last_size;
    const unsigned char *data0 = data;
 
    if (size==NULL)
@@ -615,7 +615,9 @@
       {
          if (len&0x1)
             return OPUS_INVALID_PACKET;
-         size[0] = last_size = len/2;
+         last_size = len/2;
+         /* If last_size doesn't fit in size[0], we'll catch it later */
+         size[0] = (short)last_size;
       }
       break;
    /* Two VBR frames */
@@ -676,7 +678,7 @@
          if (last_size*count!=len)
             return OPUS_INVALID_PACKET;
          for (i=0;i<count-1;i++)
-            size[i] = last_size;
+            size[i] = (short)last_size;
       }
       break;
    }
@@ -704,7 +706,7 @@
          1275. Reject them here.*/
       if (last_size > 1275)
          return OPUS_INVALID_PACKET;
-      size[count-1] = last_size;
+      size[count-1] = (short)last_size;
    }
 
    if (frames)