From patchwork Sat May 30 04:32:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19979 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 EDA66448ED3 for ; Sat, 30 May 2020 07:33:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6DD068AB65; Sat, 30 May 2020 07:33:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23992688084 for ; Sat, 30 May 2020 07:33:10 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id h4so5753196wmb.4 for ; Fri, 29 May 2020 21:33:10 -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:mime-version :content-transfer-encoding; bh=uTe8X+JeWAaJiG/BkaOl6R7aNj1tyMjFfPd6A8/Z4q8=; b=u91BczS1/KCjzOorzybjsp8wjzPe4U4cLpOCSY8S4JrrgW4cX9nOweZMr3qUC+Lek/ rBeDCCC41kcbVqFSBkVQuz9xfDtDoQ0hle6aytPetRixxE+2I6nOMlYeyPgM104qmxy/ gxXV2yxDW8mplO0cs9DyczzymRzGRc6uB5kqLYo5tI7YzIlDcb0lWgRM4ttC9tex2ngR b3JJgS8K8Nj7hPNVyslHdh/rvrI2tf0ukWEWRVbOA2vcnjxNVSCVqSjdN8+WUdKRN0Uz dH/OQFWRsmW9E1HfJ10bIv9vsGZAFJ/HLcN4RRMZGSOTAZPB0yWnHJgOMQdtL0OQ17xL U7vg== 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:mime-version :content-transfer-encoding; bh=uTe8X+JeWAaJiG/BkaOl6R7aNj1tyMjFfPd6A8/Z4q8=; b=iekEW/gU+DO81kX42ATQm+BoPuoglBM3Iz4BkjW+dZDt6c1g+7/FS4vMha633qXqRf zGR7Nelby8krMAWaYqdUhFWUN2SiekIOA0PMrvvOAKYTO5VximaBbMgCqZ3z0B2hU894 lRSctZl50711t1l1f3OjpwtjAfH4JkNwCat51MG2qz6rwRDhU8jMC1Hz1I+/+hcYl9XQ 92j4VFp744gf2Sph/B4X+WHirMga00J5Jlg35hjatCobHrjmXkvoBUYjvbYIleL8d+h4 NogqI811657wOpVpjRruLx33+H4ogCnqi4mJec0fjDVC/5FOIoDgXzlIYo/0l6CB5M9t RRnw== X-Gm-Message-State: AOAM532hg1/q2f/avUaVfthDMNt+Dse0cfRf36CSN41GmpXlLIcltYVy GE03+jXW4D0WRUb9kxOzHdh8TS8h X-Google-Smtp-Source: ABdhPJyJ844Qj9bQhXboUchllJS0vOW8i8nuVWPAsLY+iblI2BIF6CFXDzdhGhB5KAW/oHuvhqcCuw== X-Received: by 2002:a05:600c:2256:: with SMTP id a22mr11303882wmm.18.1590813189200; Fri, 29 May 2020 21:33:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id e5sm12283281wrw.19.2020.05.29.21.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 21:33:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 06:32:59 +0200 Message-Id: <20200530043300.19951-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/anm: Check extradata length before allocating frame 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Then one doesn't need to free the frame in case the length turns out to be insufficient. Signed-off-by: Andreas Rheinhardt --- libavcodec/anm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/anm.c b/libavcodec/anm.c index cd1fcc5998..e9b19d880d 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -40,6 +40,9 @@ static av_cold int decode_init(AVCodecContext *avctx) AnmContext *s = avctx->priv_data; int i; + if (avctx->extradata_size < 16 * 8 + 4 * 256) + return AVERROR_INVALIDDATA; + avctx->pix_fmt = AV_PIX_FMT_PAL8; s->frame = av_frame_alloc(); @@ -47,11 +50,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size); - if (bytestream2_get_bytes_left(&s->gb) < 16 * 8 + 4 * 256) { - av_frame_free(&s->frame); - return AVERROR_INVALIDDATA; - } - bytestream2_skipu(&s->gb, 16 * 8); for (i = 0; i < 256; i++) s->palette[i] = (0xFFU << 24) | bytestream2_get_le32u(&s->gb);