har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flvdec: Print a warning in all failure cases of parse_keyframes_index()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-29 23:24:10 +01:00
parent 67c734ea5c
commit 83f70805c0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/flvdec.c
View File

@ -177,7 +177,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream
for (i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++) { for (i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++) {
if (avio_r8(ioc) != AMF_DATA_TYPE_NUMBER) if (avio_r8(ioc) != AMF_DATA_TYPE_NUMBER)
goto finish; goto invalid;
current_array[0][i] = av_int2double(avio_rb64(ioc)); current_array[0][i] = av_int2double(avio_rb64(ioc));
} }
if (times && filepositions) { if (times && filepositions) {
@ -197,11 +197,13 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream
dts = avio_rb24(ioc); dts = avio_rb24(ioc);
dts |= avio_r8(ioc) << 24; dts |= avio_r8(ioc) << 24;
if (size0 > filepositions[1] || FFABS(dts - times[1]*1000)>5000) if (size0 > filepositions[1] || FFABS(dts - times[1]*1000)>5000)
goto finish; goto invalid;
for(i = 0; i < timeslen; i++) for(i = 0; i < timeslen; i++)
av_add_index_entry(vstream, filepositions[i], times[i]*1000, 0, 0, AVINDEX_KEYFRAME); av_add_index_entry(vstream, filepositions[i], times[i]*1000, 0, 0, AVINDEX_KEYFRAME);
} else } else {
invalid:
av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n");
}
finish: finish:
av_freep(&times); av_freep(&times);