From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8FB5D42F86 for ; Wed, 18 May 2022 13:42:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63BC368B47B; Wed, 18 May 2022 16:42:39 +0300 (EEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75CFC68B444 for ; Wed, 18 May 2022 16:42:32 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id c14so2194763pfn.2 for ; Wed, 18 May 2022 06:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=wa/tIdvXHNwG9i1NywPiymc0qulxYf6UY2Con5GMwMk=; b=Rdq1sEffu73Xwdms5i0200fEf7rz0VvnfypKOWUhBe/khDdPyRhRpgwjeXqKpcnHyd W1ST6G9/0AQ9ycNxn2L+D8w0GVXq3fA7yU3LcY1spBN30Zw1q9zR254dcSUW8ugfQQnH eTH5uPBwJTONWJ58/qJ0wWrsVmNtY81QCetxpnGNr/XrecqRJmAYf/LyEr9PIc4OV9fc 740P2h4PFoTxPXXKquJRO+1orHYPTgjtLJB9bOs0xkxulD3ZUCV7y98Pvi2kgXztWUJe qKZNk6rQkicn5SncoxF2e+eIWB6IOwxN7Z+JSBUyeE4bJJ6A6ff9GWVuOv2SerAxbxhR HWfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=wa/tIdvXHNwG9i1NywPiymc0qulxYf6UY2Con5GMwMk=; b=6vQ5B29nxWBlDRi+tIdYqbijrZvGbRlaLrl9AaLLC99tOPyc8CClr9uWT/PNHlSH4x YpY+l1yOjbnkyEqibk97Mu3/do1i8Pyca9triHkz2iF/C0MTndADeiwW224+Q6ZsGTgw xyPqwieOXGuk2vRPS27UUAzMx0pJNrZgpy2KmjPFimeyQj9KzBS5vNX1l1xfUw8nso3n GAd8Q38t2VYXa0VHWzfWMqc+ejLappK1qi8MGxa79qU2tFty60Q4CEltTFRlu+r6TjX9 o0EtkpCQgXAUCrnm9UrLpORk7e+MTtHyebsSjhBfO1IoSKCAS3EYk/liSEzGsQknkel7 KYgg== X-Gm-Message-State: AOAM530MYpob18zlBf5QKa0rlM7J7dybeuMIVNJcn73jS1k/HJU1IrnB BuIwdJvkzdgLZUKx/wbt4l/NNPwjjl0= X-Google-Smtp-Source: ABdhPJyaKp6GSpzJ+eJZCtBAhhLaKdQDFeaVu3Lls4jT5iNRyZa7cpyLX0g3PE2xaGVnN/72DEbn9Q== X-Received: by 2002:a65:694b:0:b0:3f5:f32a:3adc with SMTP id w11-20020a65694b000000b003f5f32a3adcmr3954691pgq.541.1652881350270; Wed, 18 May 2022 06:42:30 -0700 (PDT) Received: from gmail.com ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c22-20020a170902c2d600b0015e8d4eb2cdsm1691824pla.279.2022.05.18.06.42.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 May 2022 06:42:29 -0700 (PDT) Date: Wed, 18 May 2022 21:42:26 +0800 From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Message-ID: <20220518134226.GA23120@gmail.com> Mail-Followup-To: ffmpeg-devel@ffmpeg.org References: <1652280498-10408-1-git-send-email-lance.lmwang@gmail.com> <1652280498-10408-4-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1652280498-10408-4-git-send-email-lance.lmwang@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH 4/4] avcodec/dvdsubenc: return error if canvas_size is too small for subtitle render 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Wed, May 11, 2022 at 10:48:18PM +0800, lance.lmwang@gmail.com wrote: > From: Limin Wang > > Signed-off-by: Limin Wang > --- > libavcodec/dvdsubenc.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c > index fc3b7d1816..d29db7d49c 100644 > --- a/libavcodec/dvdsubenc.c > +++ b/libavcodec/dvdsubenc.c > @@ -376,6 +376,12 @@ static int encode_dvd_subtitles(AVCodecContext *avctx, > x2 = vrect.x + vrect.w - 1; > y2 = vrect.y + vrect.h - 1; > > + if (x2 > avctx->width || y2 > avctx->height) { > + av_log(avctx, AV_LOG_ERROR, "canvas_size(%d:%d) is too small(%d:%d) for render\n", > + avctx->width, avctx->height, x2, y2); > + ret = AVERROR(EINVAL);; > + goto fail; > + } > *q++ = 0x05; > // x1 x2 -> 6 nibbles > *q++ = vrect.x >> 4; > -- > 2.35.1 > will apply the patchset 1,3,4 tomorrow if no other comments. -- Thanks, Limin Wang _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".