From patchwork Thu Aug 18 22:35:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37358 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp573338pzh; Thu, 18 Aug 2022 15:36:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR51KCkDf49PZhtT1Qd5wjNsICwopD8ZW6AqyG4qmkWQZmqJ9vBnxxmS2zOL9qP6CJqngYYX X-Received: by 2002:a17:907:2ceb:b0:730:e0ce:34f1 with SMTP id hz11-20020a1709072ceb00b00730e0ce34f1mr3051079ejc.293.1660862201078; Thu, 18 Aug 2022 15:36:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660862201; cv=none; d=google.com; s=arc-20160816; b=gAIFnDhd9BQXvCB9WgdR4IQKFrO4wXUMS8rzQMOowYvhZ91lEB/0+07GgjDskg8VY9 Ap+SYxrJEVXyONd0cYXyd7yfRDEc0+O3K9pshxpcNcHKYpFgGMXO7I7A1Eq9AwwOhoIj FMivu1+7TCjI7j5Ri8q1oiXrWAILgMi0zUOpyjGKmZSW4WlWP5/qXqEBIKNkBysp7nlX fpFbCXoyIq0nLi3NOPSsARQj05bGpcN6ntTpsLaoEbp/lXMjLA0KMNimVPOwbs9mtdbG jhSZvFcJW9Pgph4OyDWmV1uuDwGZtJuQvnj8vJuZQ1DEK07eI1HIrjJS5wqyl+i+8f6j xN7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=PtA95ffZMgWC2wXmd9Pyj5Uu9nq21zGFuq7u0eOUUL8=; b=sobnIaXNwlc5cGJ7c79mJVXr7lijHyS+ZX7Reo2Wj2/cO3TYaaQ7mnwmgzaFsrPKvX UxdsInn4++bNYNCeUHtgigO4ueT/x9CYwJnylAuXdaMpZ/jdwZzKr+cA640hNKIGkb3U MwQBC+5XQm8nWszKNmWxHyUnby0BcIC9pLgcFzOgiqV9Gt3zH9LBRl29xknZXZygnMuf vM2Ku7LvH+9V1HgkEYsNXzmB84Vhy0mQTA4kmCFiV4e9/MKlfL0kXEdawqtBjgJYGIQy CpWGDwteQAMiNSXLiGane78KgED6gd4H+Mz8HDuNLmeJPrOFj+bTvnYZL3qrz/pZf1+L uVxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q17-20020a1709060f9100b00738cb93ba58si1585972ejj.203.2022.08.18.15.36.40; Thu, 18 Aug 2022 15:36:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B687968B970; Fri, 19 Aug 2022 01:36:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A8E768B737 for ; Fri, 19 Aug 2022 01:36:36 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oOo7w-00GsOS-1b for ffmpeg-devel@ffmpeg.org; Fri, 19 Aug 2022 00:36:36 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Oo6yoxtTm8s8UOo7wolzrY; Fri, 19 Aug 2022 00:36:36 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id Oo6yox80r8eSWOo6yony7j; Fri, 19 Aug 2022 00:35:36 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62febeb8 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=o7t9aYZ6cz3oJ487DMgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 19 Aug 2022 00:35:33 +0200 Message-Id: <20220818223535.13078-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220818223535.13078-1-michael@niedermayer.cc> References: <20220818223535.13078-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfD15tJ38s2JpgLqyrM8Eus6Juo9OSQBSiAObURoetiYGK1yA66+VY00Pwp1l0S2n8+iXnz/90GbGFwukKUemufuvcLtZjNRFZpvAtoMlfCR9eS4JnEJY uc2uZGmWkgsuhCimi5m813rZNa1KfVHydfmUhfU3cv4Se+0bEQr2qEdEDfkvzhTcEKsLr0ZF21OlUQ== Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/bethsoftvideo: Check block_type before frame alloc X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oVy/jRFaz0gF Signed-off-by: Michael Niedermayer --- libavcodec/bethsoftvideo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 1d0f9198cf..dc7e2f83bb 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -79,6 +79,11 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int code, ret; int yoffset; + bytestream2_init(&vid->g, avpkt->data, avpkt->size); + block_type = bytestream2_get_byte(&vid->g); + if (block_type < 1 || block_type > 4) + return AVERROR_INVALIDDATA; + if ((ret = ff_reget_buffer(avctx, vid->frame, 0)) < 0) return ret; wrap_to_next_line = vid->frame->linesize[0] - avctx->width; @@ -92,11 +97,10 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe, return ret; } - bytestream2_init(&vid->g, avpkt->data, avpkt->size); dst = vid->frame->data[0]; frame_end = vid->frame->data[0] + vid->frame->linesize[0] * avctx->height; - switch(block_type = bytestream2_get_byte(&vid->g)){ + switch(block_type){ case PALETTE_BLOCK: { *got_frame = 0; if ((ret = set_palette(vid, &vid->g)) < 0) {