RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

matroskadec: allow uint and float elements with length = 0 

Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-09-05 21:37:40 +00:00
parent 8ef38f3f50
commit 4a194c8f47
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroskadec.c
View File

@ -583,7 +583,7 @@ static int ebml_read_uint(ByteIOContext *pb, int size, uint64_t *num)
{
int n = 0;
if (size < 1 || size > 8)
if (size > 8)
return AVERROR_INVALIDDATA;
/* big-endian ordering; build up number */
@ -600,7 +600,9 @@ static int ebml_read_uint(ByteIOContext *pb, int size, uint64_t *num)
*/
static int ebml_read_float(ByteIOContext *pb, int size, double *num)
{
if (size == 4) {
if (size == 0) {
*num = 0;
} else if (size == 4) {
*num= av_int2flt(get_be32(pb));
} else if(size==8){
*num= av_int2dbl(get_be64(pb));