From patchwork Sat Aug 10 15:53:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14377 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 4539D4475F2 for ; Sat, 10 Aug 2019 18:53:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2021368AABF; Sat, 10 Aug 2019 18:53:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AD25689BC6 for ; Sat, 10 Aug 2019 18:53:32 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id u14so47612868pfn.2 for ; Sat, 10 Aug 2019 08:53:32 -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=Kua257YZNnqRFjGnIZ1frRJ3iG1N9bEJVrrNdnDDO64=; b=Vanxfrs9Y6/99/ho1rzG/xsGHC82GQHCawxooATBcMMggxRe0CHVtxI7ytSeNDe6pF x2GMYPVfiVAr6EJLogJbtAfO8wE14rn3MVIyOMqYx/Vq7bnrBXiQDxwL9Y7fC4nQ1zJ5 hkqv74JxC4VRlIUNX7dDi9A2uIPaaVHlFoDtYUoJJbvsiQIQOcxTo2PqxzpOPkfFtRX4 uETuqSPSmQr+N36b90a5WuFA9u859XRiC9L+sGx8vdBhxr+v3gFLH1yR5cMNnCb9BzWy D/IouBbWuS+QFRAwO5+vjzKrTXpYVW7GskxWGrFAfyNcTpITvsEG3chSZrW+BnhWbilP wpbA== 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=Kua257YZNnqRFjGnIZ1frRJ3iG1N9bEJVrrNdnDDO64=; b=h8wjw+YqDbEojgz7ND0U6n4ON/8gWeENeC1lig7jfGQcBeZwM1jD/3JeeDBCAXGuHW qXUP7rPZpyKz0IZmYXnuP1eJ1YuiGhw436FxsSt5aB0b5OkjGxjNkU1s+wkRT/jNQVM5 EnEgaIa9fp6nE/gxuIi+Xgy7iXzT7YZOgRtp19Xx3xOEW56PfXnTRdZj1wLisVwkyaoO 02JZqrZ4dneOE2Y4Fy+KXoudfWFv79jNf1HaO8GL3SiORJh4k2LGfwelP/1cruEnwjbb MfP5m9pXHzX1/FxNkFhdgm+W4k11GSHj2k0PGA/9lA7sQfUuw8/AcXtfm4IP/ZAPCV9+ S4uA== X-Gm-Message-State: APjAAAX9/FR9jUtnbzySHsZNu9YGMGgqMt+lz627GvsCCP/HSPv8VCrS juTpNrxpjGlf7TEYI470al6qf54W X-Google-Smtp-Source: APXvYqys4Ufft9/jFVgVySnEcVTDhAj4EeyZk5K5Exu1x8iqhvlj0EqULKgxXPhQEE27kQPn2dE+pQ== X-Received: by 2002:a17:90b:f12:: with SMTP id br18mr14372250pjb.127.1565452410694; Sat, 10 Aug 2019 08:53:30 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y22sm117706527pfo.39.2019.08.10.08.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 08:53:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Aug 2019 23:53:25 +0800 Message-Id: <20190810155325.12607-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190810145907.12326-1-lance.lmwang@gmail.com> References: <20190810145907.12326-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] 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 68ce9a8..4b18032 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_ERROR, "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_ERROR, "invalid data"); + return; + } av_log(ctx, AV_LOG_INFO, "Content Light Level Metadata, " "MaxCLL=%d, MaxFALL=%d", metadata->MaxCLL, metadata->MaxFALL);