From patchwork Fri Dec 17 21:51:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1993477iog; Fri, 17 Dec 2021 13:53:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7c7fvUw8qMsqgBjlboIIAB0Rxohc382TULyFK9zWrWGGayo1rJJji5fYd6ySAZGyF0ON2 X-Received: by 2002:aa7:c802:: with SMTP id a2mr1071636edt.310.1639778003886; Fri, 17 Dec 2021 13:53:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639778003; cv=none; d=google.com; s=arc-20160816; b=fkzKYSn2JXV1mk9I0oQsysEGgPoWPzIz4AsK0g07NtYRvS8QLAsXNmV/DGrumLc7uv 9C5yni2fHwPmJXm/LBql78bsfOxFlRiDZi4bmo8aErQPAn4T+ZPyXqFIFpB2o1ddy8QW e7e4KRhrOxJmRgwjXBCHVs+h9ABXcpotsQC+Z3yiGFCM0FjNiFgz0p/91Q3kY/JhODdn J7vFuWnVzK2A+moBxZeeiVK47nF0/jKIeczx2vyJwyiJ+X09aAehAX9t3/WEf0kg30MM 2XNUB34m6lEqFNILxa4fCTHfNL20jcuDKifrCjJHrEU/xoxQ/saAWxU2fo4/m10vNYAD Lj2w== 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=05DRDYSOwSJJK+0sDKMG/pPEYcpVR+JcjiXU/s8+zTs=; b=OA7SwmVknTh4E99e4jgJ74xCjTFteo4nX2Q8u8/j7lt8zoDR+pzya1wAVrsMDRl/5D eGu+znvsWwfIsGAHlGjip3ps7UBlbwXDQ0Pw2jUt+44dA8l5jSlB+JM2Td5c7hC4BoB3 TP5k5TGIMKI2sl+ex2hcjuF2sNS7rxz8vkimJ6dLOqAf8hahFdawiETQAvzhIzwfy6/x hFDRU3X2cY7apyP4/yqVNOs188r+rM34DhTwK4hXTUifZAre31BnCUGGN4DSH/Cfu3l1 IiOoQYv2ku73RYlDgURftuMz7qXZKy0IuFgZoe18PjeInkvoE/E5O+j+Bg0o9E97sY72 /ifA== 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 b4si565501edm.67.2021.12.17.13.53.23; Fri, 17 Dec 2021 13:53:23 -0800 (PST) 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 BD29E68AF54; Fri, 17 Dec 2021 23:53:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB63068AEBA for ; Fri, 17 Dec 2021 23:52:56 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1myL9s-00A1Hs-0I for ffmpeg-devel@ffmpeg.org; Fri, 17 Dec 2021 22:52:56 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id yL8umhDvMSgGFyL8umiq36; Fri, 17 Dec 2021 22:51:56 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=zR1LR-XVt_9DNYdS0-UA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Dec 2021 22:51:53 +0100 Message-Id: <20211217215155.19805-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211217215155.19805-1-michael@niedermayer.cc> References: <20211217215155.19805-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMAoYyTrjuUg7QHZnG9okvJUHGZLH2I1zraPZsKMnDCTFwTa4dg4qsVu2oZdPzjaPfOCL9Z6UcviVoSB8SmK+F+hK54Fd/yt9Hedh5bqFEmuESuHcz1T 5JzUbxFetGrhAfo6f/DY7eLw7e2h3E/2ZbYQ17OiPwnIzo2hs5hxWSmp Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/ccaption_dec: Use ff_ass_add_rect2() 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: BkA71lNydBqZ Fixes: Timeout Fixes: 42258/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CCAPTION_fuzzer-5540144118104064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ccaption_dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 27c61527f6e..2cd5b0aef0d 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -850,6 +850,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp int len = avpkt->size; int ret = 0; int i; + size_t nb_rect_allocated = 0; for (i = 0; i < len; i += 3) { uint8_t hi, cc_type = bptr[i] & 1; @@ -886,7 +887,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp AV_TIME_BASE_Q, ms_tb); else sub->end_display_time = -1; - ret = ff_ass_add_rect(sub, ctx->buffer[bidx].str, ctx->readorder++, 0, NULL, NULL); + ret = ff_ass_add_rect2(sub, ctx->buffer[bidx].str, ctx->readorder++, 0, NULL, NULL, &nb_rect_allocated); if (ret < 0) return ret; ctx->last_real_time = sub->pts;