Skip to content

F
ffmpeg
Commit 8c16c133 authored by Steven Liu's avatar Steven Liu
Browse files
Options

avformat/mms: add logging context to log 

Signed-off-by: 's avatarSteven Liu <lq@chinaffmpeg.org>
parent cdf8253a
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
libavformat/mms.c
View file @ 8c16c133
...@@ -60,7 +60,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -60,7 +60,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
if (mms->asf_header_size < sizeof(ff_asf_guid) * 2 + 22 || if (mms->asf_header_size < sizeof(ff_asf_guid) * 2 + 22 ||
memcmp(p, ff_asf_header, sizeof(ff_asf_guid))) { memcmp(p, ff_asf_header, sizeof(ff_asf_guid))) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (invalid ASF header, size=%d)\n", "Corrupt stream (invalid ASF header, size=%d)\n",
mms->asf_header_size); mms->asf_header_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -77,7 +77,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -77,7 +77,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
chunksize = AV_RL64(p + sizeof(ff_asf_guid)); chunksize = AV_RL64(p + sizeof(ff_asf_guid));
} }
if (!chunksize || chunksize > end - p) { if (!chunksize || chunksize > end - p) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (header chunksize %"PRId64" is invalid)\n", "Corrupt stream (header chunksize %"PRId64" is invalid)\n",
chunksize); chunksize);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -87,7 +87,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -87,7 +87,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
if (end - p > sizeof(ff_asf_guid) * 2 + 68) { if (end - p > sizeof(ff_asf_guid) * 2 + 68) {
mms->asf_packet_len = AV_RL32(p + sizeof(ff_asf_guid) * 2 + 64); mms->asf_packet_len = AV_RL32(p + sizeof(ff_asf_guid) * 2 + 64);
if (mms->asf_packet_len <= 0 || mms->asf_packet_len > sizeof(mms->in_buffer)) { if (mms->asf_packet_len <= 0 || mms->asf_packet_len > sizeof(mms->in_buffer)) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (too large pkt_len %d)\n", "Corrupt stream (too large pkt_len %d)\n",
mms->asf_packet_len); mms->asf_packet_len);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -110,7 +110,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -110,7 +110,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
mms->streams[mms->stream_num].id = stream_id; mms->streams[mms->stream_num].id = stream_id;
mms->stream_num++; mms->stream_num++;
} else { } else {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (too many A/V streams)\n"); "Corrupt stream (too many A/V streams)\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -121,7 +121,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -121,7 +121,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
uint64_t skip_bytes = 88; uint64_t skip_bytes = 88;
while (stream_count--) { while (stream_count--) {
if (end - p < skip_bytes + 4) { if (end - p < skip_bytes + 4) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (next stream name length is not in the buffer)\n"); "Corrupt stream (next stream name length is not in the buffer)\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -129,14 +129,14 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -129,14 +129,14 @@ int ff_mms_asf_header_parser(MMSContext *mms)
} }
while (ext_len_count--) { while (ext_len_count--) {
if (end - p < skip_bytes + 22) { if (end - p < skip_bytes + 22) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (next extension system info length is not in the buffer)\n"); "Corrupt stream (next extension system info length is not in the buffer)\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
skip_bytes += 22 + AV_RL32(p + skip_bytes + 18); skip_bytes += 22 + AV_RL32(p + skip_bytes + 18);
} }
if (end - p < skip_bytes) { if (end - p < skip_bytes) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (the last extension system info length is invalid)\n"); "Corrupt stream (the last extension system info length is invalid)\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -146,7 +146,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) ...@@ -146,7 +146,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
} else if (!memcmp(p, ff_asf_head1_guid, sizeof(ff_asf_guid))) { } else if (!memcmp(p, ff_asf_head1_guid, sizeof(ff_asf_guid))) {
chunksize = 46; // see references [2] section 3.4. This should be set 46. chunksize = 46; // see references [2] section 3.4. This should be set 46.
if (chunksize > end - p) { if (chunksize > end - p) {
av_log(NULL, AV_LOG_ERROR, av_log(mms->mms_hd, AV_LOG_ERROR,
"Corrupt stream (header chunksize %"PRId64" is invalid)\n", "Corrupt stream (header chunksize %"PRId64" is invalid)\n",
chunksize); chunksize);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment