From patchwork Sat Aug 10 14:59:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14373 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 4269C4487DA for ; Sat, 10 Aug 2019 17:59:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29A1668ABA3; Sat, 10 Aug 2019 17:59:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D498068AB7E for ; Sat, 10 Aug 2019 17:59:15 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id o70so2210181pfg.5 for ; Sat, 10 Aug 2019 07:59:15 -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=cSRo0AAyLof4S5U0e/2efvTFgenyna0FJEvmRFnlKfc=; b=sNXo0DJ1Tay2tYx13w9RmcseJ2IjoczPdeI1DajKkPmymntTpIirMN+P4ZzadL7raP GnG1Bv3O4d6UcE6zANxeLb9t97cwf477j0frGzUrQ+TbfaGf+alGt21jgT3mLfEFqEK0 +zXEDQIO99tr8J5jNp3kNdCmTF8afuRa8cAiy4nQd9tnG60qscpyXC9OFLOq7xAiXb2m vD2VaAz7u84cLmfmaIKLPjY9C06UE1o0df/u14Gk63xMIDsQg48AywXhjeHrQYgh4e1c 0cCOGzj+qvT8EESJzK8BnM6o3DqcYSayK6n8T3fh5mLQmCHHptrS3HLob1ILFDp+tihS /SZA== 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=cSRo0AAyLof4S5U0e/2efvTFgenyna0FJEvmRFnlKfc=; b=rp//pKcI5MJIia4h8AwQONoi+s5HrJb6NvBikXfeI0AKOUwpinp+125PGuacESECDV L7Gn9BIqUnRDpgZfWr3Y6d7eR6wyJHAeSkOrUguVXvJoreJDsf0HS512N4t3UZuMR6cJ zzRcAa3pcSZKgnB88nWzAaDg0cPmvJiL+KqaoElKbosEGRDb0+7xoCgafqpvtWP6S5m5 mwKe1QSZVAggaVeBYatd85sxCf3WAwI2yyAE+lqLRXpEXbkmNBWhIgI/hIPYAkRty4vt nLiLTttMn3BiUgxcH0bSldT0M/4MPOHpwdfuyp51C77xGi+67tfXiZmEQBg65zltm1Xu Pz+A== X-Gm-Message-State: APjAAAV/7r0tqrKOzg5ksZ6IYXZlaL4RgVfcbpj9zmke6iRwXkaXb8/e kVfRgarB+CerU5oEsqxXDYFx0FVL X-Google-Smtp-Source: APXvYqyRE4ghorg0EEzYfs65gFHeDVbyMYNZhFcqSsgcFCaFrb+ruZpGK3FqVBkNELpRZ4MgzCS2kQ== X-Received: by 2002:a63:f07:: with SMTP id e7mr23341687pgl.238.1565449154181; Sat, 10 Aug 2019 07:59:14 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id c35sm33221568pgl.72.2019.08.10.07.59.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 07:59:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Aug 2019 22:59:07 +0800 Message-Id: <20190810145907.12326-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] lavf/dump: add the valid check for consistent 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 --- libavformat/dump.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index 1c44656..d3c0299 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -328,6 +328,11 @@ static void dump_cpb(void *ctx, AVPacketSideData *sd) static void dump_mastering_display_metadata(void *ctx, AVPacketSideData* sd) { AVMasteringDisplayMetadata* metadata = (AVMasteringDisplayMetadata*)sd->data; + + if (sd->size < sizeof(*metadata)) { + av_log(ctx, AV_LOG_INFO, "invalid data"); + return; + } av_log(ctx, AV_LOG_INFO, "Mastering Display Metadata, " "has_primaries:%d has_luminance:%d " "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) " @@ -346,6 +351,11 @@ static void dump_mastering_display_metadata(void *ctx, AVPacketSideData* sd) { static void dump_content_light_metadata(void *ctx, AVPacketSideData* sd) { AVContentLightMetadata* metadata = (AVContentLightMetadata*)sd->data; + + if (sd->size < sizeof(*metadata)) { + av_log(ctx, AV_LOG_INFO, "invalid data"); + return; + } av_log(ctx, AV_LOG_INFO, "Content Light Level Metadata, " "MaxCLL=%d, MaxFALL=%d", metadata->MaxCLL, metadata->MaxFALL);