From patchwork Sun Dec 19 23:56:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32741 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3845382iog; Sun, 19 Dec 2021 15:58:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3gQf/jQVFvxiVraVbhjgnvP/APRmg86W5iiyIrTq+Stccf4D5xjagCPf9jiV+vcldhJrm X-Received: by 2002:a17:906:d8cd:: with SMTP id re13mr11579263ejb.231.1639958301551; Sun, 19 Dec 2021 15:58:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639958301; cv=none; d=google.com; s=arc-20160816; b=00CV2wIJpIvXer4doH2MN7ag+7sjzKZuVhhIki1EUAf3Xjolcy7uH00K+7bnH1BD+8 LHmXB3Lg74ObKAkIiMIhM02iu/2ukitARXH6Q0BVWy+XjQrF6prZkLczG9RfzdAZPhfR 2w0iDmBcivXO5G4Eu4u77HMtpn1VjFstAq66zyN1rHgQyTyiaKOJvfSaqwYD3HWXet4E QTs6KCgEqsoUJJ6OZrM3zas42QcRy7nE7kRdTGHNX/P2kYIRgHPoHs7y3b1uXFw8Beq/ I8/eCw4oB28es6grXMRXTNph7jQVBKDazp+PJ43RBdQQDkvMalBbsnrlALwNUbCwb3l5 +bCA== 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=3tnF/cGM3tGTYD2Z5kdFKQRt96NLzhzvPc0B9l5mxoo=; b=zhHW8xooD+cdyvs9Fl8Ao2EZZtYBTeIZuhmpLc19ObAPrwf1ItESKt3YT65DmAAM8E VWUGqyXcxBeycgtUcTGlKY6JJb0vnB3szm+X7VP+AvyDYHzInH0XmcBBAorldouRAZrs ZOUXdp+NdEWp46+DAJ3LEVSwJc6Ovb751uCr1XAnt04m8K7gdmmh26tZlQF8GgNXTxBX FcU0/GeKGSiv9VzYoWzMEoVbW5c1GLoxSmUQk8d8tCiAIE5WaL2cZ2/x4kqkeEgaZgNq h7ifvjKKmJ3BJF+BUTI5HC8CxfMUeABuLO3tv38eHewpCXd3Jvv6AzvUxFoVLALHOV4F WUMQ== 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 w22si697682edc.505.2021.12.19.15.58.21; Sun, 19 Dec 2021 15:58:21 -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 6455868AF4C; Mon, 20 Dec 2021 01:58:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA49968AE56 for ; Mon, 20 Dec 2021 01:58:00 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mz640-00AZD1-0P for ffmpeg-devel@ffmpeg.org; Mon, 20 Dec 2021 00:58:00 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id z632mKCzmSgGFz632m1QkD; Mon, 20 Dec 2021 00:57:00 +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=PIEbeTFyOMytTh32nAsA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 20 Dec 2021 00:56:59 +0100 Message-Id: <20211219235700.16595-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211219235700.16595-1-michael@niedermayer.cc> References: <20211219235700.16595-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfO0T0+AMT5c4KWZW48/9sr6DOwsTFGLbZ74COUhpCmmmdtjG6RRD0jN0iT8Z5Ec/AQ8n5dxdZGkUQK16bzuFuU6HzXzEHaHJ4ahdKqdddlM6U7WGiXWW hMIhZp/jVjCjhmr3FMZi4/aRtTlKqTPIQDZe4NR2SMuZXJuhz/RDXEVU Subject: [FFmpeg-devel] [PATCH 2/3] 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: L36z3HiasvyS 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 27c61527f6e..15be18eb164 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; + unsigned 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; @@ -896,7 +897,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp if (!bptr && !ctx->real_time && ctx->buffer[!ctx->buffer_index].str[0]) { bidx = !ctx->buffer_index; - 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; sub->pts = ctx->buffer_time[1]; @@ -914,7 +915,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp capture_screen(ctx); ctx->buffer_changed = 0; - 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; sub->end_display_time = -1;