From patchwork Wed Mar 25 10:45:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18391 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 66FC4448C77 for ; Wed, 25 Mar 2020 12:46:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C71D68B58A; Wed, 25 Mar 2020 12:46:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DE2D68AFFB for ; Wed, 25 Mar 2020 12:45:56 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id 7so981623pgr.2 for ; Wed, 25 Mar 2020 03:45:56 -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=NfDEa4HqTfuKsI5plfKU9B4A6w5JnP3a6+64ZgEf1RA=; b=ElTIWbNJzKuud8/8Od2Sbb8qg2+rLrTQEeZP65jejfSGQrF2QL9eP9rCpn8L5bLdjh N+2VC/I1MC2RuuV1MmiLE6rMPzxAJu1YpTHRtaQ4sbsJxcZFQif3GfUxJhub2gftpZeO qwIhbczEevyvYtfgAS3Us0bwYzPWmppCNA9TxPBIjiXh8m8spPVHkgQq3e9Gg2rSOEFn kf2p0+m+JqeWJQPLNoeRStQxM+WGS8Cx/yv8gDsQoDFiKKre/hafeDyUImL81qjvDRKI 9QC8megVl/rok+vO9+zSBzZFfzrShIkVplCt6+6DUyU7kgDvDgZZ69Z0WLKkytbwIYym IB8g== 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=NfDEa4HqTfuKsI5plfKU9B4A6w5JnP3a6+64ZgEf1RA=; b=XckxW10pUwI+IWV+zIRrEyNobVHEYifOgxgoBDD8+TbDWRaqy2p5saSaWv/u1w0hwY qz+iwC4JXS/uJnBog0A5ujrSo+mIBBrlYT5S+0YvtsIMrWy2vMlmnn212Wk7hRKZE+Xz Yo+lSExyjEH1gNztRhouJiCIAIJr7lwM4BZ5V1RvrMasHjMIevATht3Dp6oxuW/3KPMl BysxewM5s4VdskP3yd/0eoLqOqOZInLE4yV2PxJKvkgHrTYINUXiwBYh79ZAnOuYhp4s 5EEholcbbMTbsxbX25WvESSUchgfDwZlQRnfXirB9wSPctA0UVdeorVnzWdIbBAAEZrY vJcQ== X-Gm-Message-State: ANhLgQ1Kr6atIRTv55X09rzZiKUs1/ekiGklI8/r+2oV0vVn7iPcQLqt /31uXCJ5lK5kdHkwa/6Hjob85Bdm X-Google-Smtp-Source: ADFU+vv2dfB1pV7grj3TdAyNx1cyX6HUGq9ckLHOY9vwZ9KFN/xt/2KPAaGXcFtJGWNxolpqtWc8bw== X-Received: by 2002:aa7:8649:: with SMTP id a9mr2801795pfo.138.1585133154012; Wed, 25 Mar 2020 03:45:54 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e184sm17944566pfh.219.2020.03.25.03.45.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 03:45:53 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Mar 2020 18:45:47 +0800 Message-Id: <20200325104548.28367-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/2] avfilter/vf_showinfo: check if the s12m data size is valid 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 79b79db2d3..71534d1fa8 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -318,6 +318,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) break; case AV_FRAME_DATA_S12M_TIMECODE: { uint32_t *tc = (uint32_t*)sd->data; + if (sd->size != 16) { + av_log(ctx, AV_LOG_ERROR, "invalid data"); + 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); From patchwork Wed Mar 25 10:45:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18392 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 5142D448C77 for ; Wed, 25 Mar 2020 12:46:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3942768B4D9; Wed, 25 Mar 2020 12:46:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BB5568AE45 for ; Wed, 25 Mar 2020 12:45:57 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id 23so879546pfj.1 for ; Wed, 25 Mar 2020 03:45:57 -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=9Hv9LgIswKfORI50p01z/ts1xmKdeveAZsAk3bWK/aM=; b=DzxSGhThKQ9kHHLF/GCi4Br2OLAV8sNxrM1yhxpR/SzzwOmv4Hc3mmm4DX85NdaVz0 nSUozG1xcweQaFNms8ubEZRQzwkJF63A+eNESELPb5jHmddfFKfOGnoLlribPm4WWX93 o/zekUKCF/3PIDOrc5/aXHG99bVwQA+TDHh53ietT0hqc09dPvIuy3QbElUByOtG6Hhu dCzmzggTE8qu2980WOreTvPPcdyMonnro/QArru7Yx1kuhFLcBEXXkwHUgGKzTmRrIXg hH835hUu2cXh76pXhvkMtcmYoYMGUTZpf/OW6n9F+hE0nPhClWa0OAWsMIQ6877CUC0e 839Q== 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=9Hv9LgIswKfORI50p01z/ts1xmKdeveAZsAk3bWK/aM=; b=gkz76swgkp5FpPExQrragF6n8Sx5LnfGaV/sPxnT/exnfCe2s3wq7KmZVdcpqZ8w3/ Atkfj9ZASapZryndujVqvgfAxw+d+zGaBlwxHkq+r/SNnvCeA1IcP198HOY2VYMWsNIC CfTcRdNDySb0nE2BET2de7hYwCLJ9YcKFYrX5FKOBgPKn9TsnjCplZ3VuEwAl08eOFVp PUq9rjXQElPZ/c1/B2BO+MqTdVbDIrx53dOsmOMVgePcgBofnJLXZElOsLjVNSRFC46O DwtFOCfu9gCSF2vogjr+KcPVChsYOQm94iRiaEiQpkqs58mUDOsmTbIXcemN973vYfFw MzWQ== X-Gm-Message-State: ANhLgQ2e0fZWNSNAyZMIXtvhMLzKNvQJYvhk8myZGEldQ3802U4+WaPf JBedCC6mP9jL64NtiJYkSpc7GE5f X-Google-Smtp-Source: ADFU+vvRAkKWI5vF9CeBNKdzbp2i0bJGXczBPiNclgH0i9fwNs8VI0rj1p+T39FjeRC/HpydXgMGWQ== X-Received: by 2002:a63:5fd8:: with SMTP id t207mr2457667pgb.186.1585133155388; Wed, 25 Mar 2020 03:45:55 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e184sm17944566pfh.219.2020.03.25.03.45.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 03:45:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Mar 2020 18:45:48 +0800 Message-Id: <20200325104548.28367-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200325104548.28367-1-lance.lmwang@gmail.com> References: <20200325104548.28367-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avfilter/vf_showinfo: limit the max number of timecode 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 71534d1fa8..b0b0051357 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -318,14 +318,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) { av_log(ctx, AV_LOG_ERROR, "invalid data"); break; } - for (int j = 1; j <= tc[0]; j++) { + for (int j = 1; j <= m; 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] ? ", " : ""); + av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != m ? ", " : ""); } break; }