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 CFA7544B98 for ; Wed, 8 Mar 2023 21:37:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9E4A68BD77; Wed, 8 Mar 2023 23:36:55 +0200 (EET) Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7C7E68BD24 for ; Wed, 8 Mar 2023 23:36:49 +0200 (EET) Received: by mail-il1-f169.google.com with SMTP id w4so7102564ilv.0 for ; Wed, 08 Mar 2023 13:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; t=1678311408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xi5HTgm6xvwDoccAqf5/xO4RWb8/rDvt1I/hX785J8k=; b=KlylxBGh+Kkn6W58eJJ+BWaSv5tvmOOakZ/0hxa6VSkmkQY54Binm8sVeUJErbp923 9YpIrw4QspUDUhBvcZrfBIzyiarVoku8ghPTnoNxYSRsXTH5b+2j3k24YEl9C+8lua7L bZT/efpvhVSYLgGPo1yZl0e5zsmY9/Fd+OBIiSjgWd584pWAapEXEWyrFbNoi5+ocEBg MMZ9nyGEQxoh4E//eJudOMXNtka5G3Wpa3xQ6TFvv6Cv2kUH+u94iKvBXNTVY/0Xaytk dXeA1n3sTLs0ATXB3IQ+vlYnNbcz7X04oGQqczoknNGcHOizvn9cRkDU7Fd15P+XC9Vg oHKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678311408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xi5HTgm6xvwDoccAqf5/xO4RWb8/rDvt1I/hX785J8k=; b=1sUGWsQn7/oYr/RI3PVJKJsW5hk9x5WNkgFJn7JkUNAC38Jpm5edVgLsBSxROGfLzP P+ygdTatrKKigvGheWU28AxTdwszIOzlwy5gnORi/huNLy4RrQoX5IoI+anJdP4ih1j7 jORqhE6qOpx2YtDxVqZhNr9MvR9t9mhffmFwQ8jU5bPSdi8dDzsWHu05cK6QUfAXaQBK XPMr4+zE0RBP7unsDAFLYcQk/O60cwHSlBIFubwy8FshiyKiOPZnB0xtygdwi0VK9OY6 Dj5dbgKNvtG9fGrI1mPkLIzwg+yG5f9vBZW10MwGzpfQ4GDgTpuKPnV8GvQ9PYMswnOs xkaA== X-Gm-Message-State: AO0yUKXgvEAfIGLhqV0C0vKVF/J6lYeGK4vVAeoAMP3+4rAfWlVi9qhL Qe1btsjPjsLUGpfek4WSBNdm7GMDgqx5u1705BwU X-Google-Smtp-Source: AK7set/BtYJKH1TFi5HzLJFm6PsdlpbqbgVMt17VLYqhhgGNBGTZtiKtcFyAzFO2r22QiKuExYBz6w== X-Received: by 2002:a05:6e02:12ed:b0:314:f7f:a369 with SMTP id l13-20020a056e0212ed00b003140f7fa369mr522475iln.11.1678311408208; Wed, 08 Mar 2023 13:36:48 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:e81a:6c2d:648b:3b7d]) by smtp.gmail.com with ESMTPSA id h21-20020a02c4d5000000b003c4ec576030sm5338263jaj.4.2023.03.08.13.36.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Mar 2023 13:36:48 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2023 15:36:40 -0600 Message-Id: <20230308213640.83444-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230308213640.83444-1-rcombs@rcombs.me> References: <20230308213640.83444-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/ass: error if not passed exactly 1 rect 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: This never produced valid output. --- libavcodec/assenc.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index db6fd25dd7..41332d33fb 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -45,27 +45,26 @@ static int ass_encode_frame(AVCodecContext *avctx, unsigned char *buf, int bufsize, const AVSubtitle *sub) { - int i, len, total_len = 0; + int len; - for (i=0; inum_rects; i++) { - const char *ass = sub->rects[i]->ass; - - if (sub->rects[i]->type != SUBTITLE_ASS) { - av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); - return AVERROR(EINVAL); - } + if (sub->num_rects != 0) { + av_log(avctx, AV_LOG_ERROR, "Only one rect per AVSubtitle is supported in ASS.\n"); + return AVERROR_INVALIDDATA; + } - len = av_strlcpy(buf+total_len, ass, bufsize-total_len); + if (sub->rects[0]->type != SUBTITLE_ASS) { + av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); + return AVERROR(EINVAL); + } - if (len > bufsize-total_len-1) { - av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n"); - return AVERROR_BUFFER_TOO_SMALL; - } + len = av_strlcpy(buf, sub->rects[0]->ass, bufsize); - total_len += len; + if (len > bufsize - 1) { + av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n"); + return AVERROR_BUFFER_TOO_SMALL; } - return total_len; + return len; } #if CONFIG_SSA_ENCODER -- 2.39.1 _______________________________________________ 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".