Update to opus-HEAD-66611f1.

src/opus_multistream_decoder.c

 /* Copyright (c) 2011 Xiph.Org Foundation
    Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 
@@ skipping 57 matching lines @@
       int coupled_streams,
       const unsigned char *mapping
 )
 {
    int coupled_size;
    int mono_size;
    int i, ret;
    char *ptr;
 
    if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
-       (coupled_streams+streams>255) || (streams<1) || (coupled_streams<0))
+       (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams))
       return OPUS_BAD_ARG;
 
    st->layout.nb_channels = channels;
    st->layout.nb_streams = streams;
    st->layout.nb_coupled_streams = coupled_streams;
 
    for (i=0;i<st->layout.nb_channels;i++)
       st->layout.mapping[i] = mapping[i];
    if (!validate_layout(&st->layout))
       return OPUS_BAD_ARG;
@@ skipping 23 matching lines @@
       int channels,
       int streams,
       int coupled_streams,
       const unsigned char *mapping,
       int *error
 )
 {
    int ret;
    OpusMSDecoder *st;
    if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
-       (coupled_streams+streams>255) || (streams<1) || (coupled_streams<0))
+       (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams))
    {
       if (error)
          *error = OPUS_BAD_ARG;
       return NULL;
    }
    st = (OpusMSDecoder *)opus_alloc(opus_multistream_decoder_get_size(streams, coupled_streams));
    if (st==NULL)
    {
       if (error)
          *error = OPUS_ALLOC_FAIL;
@@ skipping 395 matching lines @@
 bad_arg:
    va_end(ap);
    return OPUS_BAD_ARG;
 }
 
 
 void opus_multistream_decoder_destroy(OpusMSDecoder *st)
 {
     opus_free(st);
 }