From patchwork Sat Jul 4 12:32:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20791 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 AEB1244BDD9 for ; Sat, 4 Jul 2020 15:41:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82A3368AE72; Sat, 4 Jul 2020 15:41:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0218268A50D for ; Sat, 4 Jul 2020 15:41:13 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id m22so5905886pgv.9 for ; Sat, 04 Jul 2020 05:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0N1z+VFQJOHErHN1+CfXK/1OaCXxbDIShmO9pEV4z1g=; b=AHo8vzfoGW/jRZ/f0Pn+qlP5x4BEw+sQNAttE0x3xN7+ehHXooU/u6GX/2cPwmlhka Dn+uuQUwA7sFdZXyQzAii93knySjT3ApEq3Bas8ooCKVp2LKVtpst/6FIa4h/qlNVKHP 0pZgqni6DTI5iPxA1L9xGG5jvGrTexhlhpt6yBhoA51FePfctNJv82EX42JeJqqOj1u0 ylZirOgQTtMbmS2+C0bSjTbcdWu+atbNNOA3Mu1+1jFbIvwIFtpKCpqEolftWrPPaPaQ 6BUXT5aQtqs8mvLTgDrEdt7xCzNHomCpYZ3BqZ/nmSuulb0JNMBUp/G5JNkYtEVcIp8p ICHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0N1z+VFQJOHErHN1+CfXK/1OaCXxbDIShmO9pEV4z1g=; b=UywEQkElyHC+fkhWDQFf0wyXWyiRe1bpARR8nR3n6o4PskZuUrjMM/BbK+JjjxCDv8 kT6xgF+7YAQZTqy3xTLrvs7qY6EOI9jd8BSE+4IiNgPFHllUAJzSqRViWOHNuGusABlp RctkCAjoTEHWMOlg3EXGfqlYDbZkM0wG1qqvFbI7hE76SCPY/Cxhyog5kW0/4jaPSgix AkHsQW5trrZEP10Qdf0ywy/fbgVBggPm2FQiSd5aDmnDU6yTUohqVPOn+JU7QIipuL2b gUtMsv0wjfQmTp2SBivDa1d1TstMkjSImg1o4sXy3y1adi9IpJs68RS1EJ+GddKWxVJ1 wanA== X-Gm-Message-State: AOAM532nDUXenQKs2GtQWv2Wmvsz12CiytCasXhfSBxCJoFg3PNMqPu2 GiraIJCLwou+6Z3gLMBH0VsZT1X5 X-Google-Smtp-Source: ABdhPJwU6Z9/kTAFI6rBtA5ad9ASVYXyc5bpmknE1TK1xVUgSuEYiT/IlLKalP5gvQHRMvZtJ/aETg== X-Received: by 2002:a63:7f41:: with SMTP id p1mr33529321pgn.215.1593865985194; Sat, 04 Jul 2020 05:33:05 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id k7sm14851630pgh.46.2020.07.04.05.33.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jul 2020 05:33:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Jul 2020 20:32:58 +0800 Message-Id: <1593865979-16104-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_showinfo: check sd->size before reference the sd->data 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Or it'll cause null pointer dereference if size < sizeof(uint32_t), also in case tc[0] > 3, the code will report error directly. Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index d7ee677..1634f68 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -365,15 +365,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) break; case AV_FRAME_DATA_S12M_TIMECODE: { uint32_t *tc = (uint32_t*)sd->data; - int m = FFMIN(tc[0],3); - if (sd->size != 16) { + + if ((sd->size != sizeof(uint32_t) * 4) || (tc[0] > 3)) { av_log(ctx, AV_LOG_ERROR, "invalid data\n"); break; } - for (int j = 1; j <= m; j++) { + for (int j = 1; j <= tc[0]; j++) { char tcbuf[AV_TIMECODE_STR_SIZE]; av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0); - av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != m ? ", " : ""); + av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : ""); } break; } From patchwork Sat Jul 4 12:32:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20795 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 5C8E744BB89 for ; Sat, 4 Jul 2020 16:02:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37BEF68B414; Sat, 4 Jul 2020 16:02:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 487D768A253 for ; Sat, 4 Jul 2020 16:02:41 +0300 (EEST) Received: by mail-io1-f65.google.com with SMTP id o5so34846024iow.8 for ; Sat, 04 Jul 2020 06:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9Zf0mrWWQGfbe25MdBAM92Gkr8/uywStGZAYq9yM6Xg=; b=MxiP1TB7uvwcs1cOrvteF8YBJAfkizPDjmloba/5xZBeSJFOy2GNlhMO5sAellLpM7 lafW18EJYPBzjkgBBPKUr+7ytLZHXzgXgHeyi8ktP1fg/x999vthyeBmG2ee8S6kDwpn BBY9cIoQzm7rYrxZwj+2PAckWkPqd6u2Wn1SHhfeLVpvGhlSLlLq+qQvUh7PmhNgeIb4 VlXb/s4YrsC4zkoDFhu200qRqguZfHt5nGqXR1lby8zl3D08P7eb6WLQAFfcb2oT7/W7 71t8Yb4g0337RqgD2o6MlSsG1JirNHFpuJR6lj7HP5DlHbmY3oz2ZzgbDR8kSVgtC9B7 O91Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9Zf0mrWWQGfbe25MdBAM92Gkr8/uywStGZAYq9yM6Xg=; b=GNZAKqGztrU8fM5Y4yh25KDrjwkApKYOdchBrtEBiZxLd+IgLDQEFr6FR2pMBLbyGp rY1lhsuQnPZ6nAnryScTV4zXAZHKv1pQrCLokW2HppkHHUkLDqNsTKRKK+N9ASIgQA9I M2+hjofTA2/jS8WUIzDLrnL5gunIaM5YyHvyG7xRI0PAaO91Wa8hbF7jQ474jg0triMu cAtp+50gQ2nixd7KK11y+521F0Wjz7IjL0q4b3jeJn7vflBWaQownReumH///rmVP6wT ZfokDR42+aiRt8Yyo9WrPLRLsNIhRL1SaPekgP0jq/JcXlwMnyoDd+HuEE1l77BR37Rf cZbQ== X-Gm-Message-State: AOAM530A/SlNEJKBN1EUmURE8sT/3aX97Bok1NQhIsxNB2MpWAXDgMcE WmrEKg78sCqq9FP82OwuzOYOBRcW X-Google-Smtp-Source: ABdhPJzB7uFT0voDsAbKlYfF+2Qlp0CzA3lovZn7RkHrtj9CoUTVCI1hM0QWed8uiwjMNOK15bRFsw== X-Received: by 2002:a63:125a:: with SMTP id 26mr33767600pgs.340.1593865987691; Sat, 04 Jul 2020 05:33:07 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id k7sm14851630pgh.46.2020.07.04.05.33.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jul 2020 05:33:07 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Jul 2020 20:32:59 +0800 Message-Id: <1593865979-16104-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593865979-16104-1-git-send-email-lance.lmwang@gmail.com> References: <1593865979-16104-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_showinfo: add dump_s12m_timecode() helper function 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 1634f68..f8a54fc 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -114,6 +114,22 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd) av_log(ctx, AV_LOG_INFO, " (inverted)"); } +static void dump_s12m_timecode(AVFilterContext *ctx, AVFrameSideData *sd) +{ + const uint32_t *tc = (const uint32_t *)sd->data; + + if ((sd->size != sizeof(uint32_t) * 4) || (tc[0] > 3)) { + av_log(ctx, AV_LOG_ERROR, "invalid data\n"); + return; + } + + for (int j = 1; j <= tc[0]; j++) { + char tcbuf[AV_TIMECODE_STR_SIZE]; + av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0); + av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : ""); + } +} + static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd) { int nb_rois; @@ -364,17 +380,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) dump_stereo3d(ctx, sd); break; case AV_FRAME_DATA_S12M_TIMECODE: { - uint32_t *tc = (uint32_t*)sd->data; - - if ((sd->size != sizeof(uint32_t) * 4) || (tc[0] > 3)) { - av_log(ctx, AV_LOG_ERROR, "invalid data\n"); - break; - } - for (int j = 1; j <= tc[0]; j++) { - char tcbuf[AV_TIMECODE_STR_SIZE]; - av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0); - av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : ""); - } + dump_s12m_timecode(ctx, sd); break; } case AV_FRAME_DATA_DISPLAYMATRIX: