From patchwork Wed Oct 2 06:58:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15452 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3F225448168 for ; Wed, 2 Oct 2019 09:58:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FB2A688101; Wed, 2 Oct 2019 09:58:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0F076880F4 for ; Wed, 2 Oct 2019 09:58:47 +0300 (EEST) X-QQ-mid: bizesmtp26t1569999510ts1ll76l Received: from localhost (unknown [47.90.47.25]) by esmtp10.qq.com (ESMTP) with id ; Wed, 02 Oct 2019 14:58:30 +0800 (CST) X-QQ-SSF: 01100000008000K0ZRF1B00A0000000 X-QQ-FEAT: y/Yfw/TLgL4O6bRjrRjZd+wfm5ZjPOviC1Ox7nf7SchEQdEkN/FqfH/nxIUya mLhlp93sL5D9on3dV6UEAxDrDYDqWcE+L5UVZWYrW8N3deNhk/AsVmEYgG5SkIZoKUs1Lyu Ey3O7mDyzOLxWw5iiE8f6WUtyhJdPnPCxHC92vKZLfPHZ5XDMSnt5PzV2InTURZOuzDLx22 gqPWxcB8aNKzqo6LkVYzPQ/y8rsyIgw1EXt2F94FhSS0hy6yHjJyy+azWi/tzJfJCdhnkzj xdjP1ENGxUQtRoIQ8MCn7Sv6VYkVsTqu8EOVFSFRMC2V42yRn5R0CiWL4= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Oct 2019 14:58:08 +0800 Message-Id: <20191002065815.30333-7-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20191002065815.30333-1-lq@chinaffmpeg.org> References: <20191002065815.30333-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2 07/14] avformat/mms: add logging context to log X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/mms.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/mms.c b/libavformat/mms.c index 768fda6525..16babc0954 100644 --- a/libavformat/mms.c +++ b/libavformat/mms.c @@ -60,7 +60,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) if (mms->asf_header_size < sizeof(ff_asf_guid) * 2 + 22 || 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", mms->asf_header_size); return AVERROR_INVALIDDATA; @@ -77,7 +77,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) chunksize = AV_RL64(p + sizeof(ff_asf_guid)); } 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", chunksize); return AVERROR_INVALIDDATA; @@ -87,7 +87,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) if (end - p > sizeof(ff_asf_guid) * 2 + 68) { 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)) { - av_log(NULL, AV_LOG_ERROR, + av_log(mms->mms_hd, AV_LOG_ERROR, "Corrupt stream (too large pkt_len %d)\n", mms->asf_packet_len); return AVERROR_INVALIDDATA; @@ -110,7 +110,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) mms->streams[mms->stream_num].id = stream_id; mms->stream_num++; } else { - av_log(NULL, AV_LOG_ERROR, + av_log(mms->mms_hd, AV_LOG_ERROR, "Corrupt stream (too many A/V streams)\n"); return AVERROR_INVALIDDATA; } @@ -121,7 +121,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) uint64_t skip_bytes = 88; while (stream_count--) { 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"); return AVERROR_INVALIDDATA; } @@ -129,14 +129,14 @@ int ff_mms_asf_header_parser(MMSContext *mms) } while (ext_len_count--) { 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"); return AVERROR_INVALIDDATA; } skip_bytes += 22 + AV_RL32(p + skip_bytes + 18); } 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"); return AVERROR_INVALIDDATA; } @@ -146,7 +146,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) } 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. 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", chunksize); return AVERROR_INVALIDDATA;