diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-13 12:33:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-13 14:22:21 +0200 |
| commit | 6bed88ac78c292edb4714e035957d76b3e4cbff7 (patch) | |
| tree | 59f47ecd80d2020cb275868ec4060c2415e8c736 | |
| parent | 276ab7c148b98ac44017ff39a8e525a1516a440e (diff) | |
| download | ffmpeg-6bed88ac78c292edb4714e035957d76b3e4cbff7.tar.gz | |
avformat/flvdec: Print terminator value found if it differs from AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/flvdec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 36a179722f..519c8d9406 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -433,6 +433,8 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, case AMF_DATA_TYPE_UNSUPPORTED: break; // these take up no additional space case AMF_DATA_TYPE_MIXEDARRAY: + { + unsigned v; avio_skip(ioc, 4); // skip 32-bit max array index while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) @@ -441,11 +443,13 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, if (amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) return -1; - if (avio_r8(ioc) != AMF_END_OF_OBJECT) { - av_log(s, AV_LOG_ERROR, "Missing AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY\n"); + v = avio_r8(ioc); + if (v != AMF_END_OF_OBJECT) { + av_log(s, AV_LOG_ERROR, "Missing AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY, found %d\n", v); return -1; } break; + } case AMF_DATA_TYPE_ARRAY: { unsigned int arraylen, i; |