eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure mapping matrix size is always valid.

Browse source 
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
This commit is contained in:
Andrew Allen 2017-12-04 16:05:57 -08:00 • committed by Jean-Marc Valin
parent 65f11d326d
commit cae4445fb7
No known key found for this signature in database
GPG key ID: 5E5DD9A36F9189C8
5 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/mapping_matrix.c
View file

@ -39,9 +39,21 @@
#define MATRIX_INDEX(nb_rows, row, col) (nb_rows * col + row)
int mapping_matrix_get_size(int rows, int cols)
opus_int32 mapping_matrix_get_size(int rows, int cols)
{
return align(sizeof(MappingMatrix)) + align(rows * cols * sizeof(opus_int16));
opus_int32 size;
/* Mapping Matrix must only support up to 255 channels in or out.
* Additionally, the total cell count must be <= 65004 octets in order
* for the matrix to be stored in an OGG header.
*/
if (rows > 255 || cols > 255)
return 0;
size = rows * (opus_int32)cols * sizeof(opus_int16);
if (size > 65004)
return 0;
return align(sizeof(MappingMatrix)) + align(size);
}
opus_int16 *mapping_matrix_get_data(const MappingMatrix *matrix)