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 8606D40EE4 for ; Wed, 11 May 2022 14:49:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 483D268B446; Wed, 11 May 2022 17:48:37 +0300 (EEST) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E4E668B443 for ; Wed, 11 May 2022 17:48:29 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id n10so2436668pjh.5 for ; Wed, 11 May 2022 07:48:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WBk+kqWjekKqi3COi7ggFtY/nxu0hDoWDiSLXyCtwJ0=; b=ED+/lhk+zWciQArakMdRkaggYsvJj3xhOXsWTPj2+NJOsVjTNLBwWiEPIr5acSe9ag c61o/2gK/n1ra2jo+3wor9AOewNlz2tSTunsKg0I24XLy6ykBqM3nrB1HDzpBKQO/OMq pBdRd+HOdrwzsRZwL5ixgLi22246ODMgiCX+j9mT72mLBy0V0aPzDtkWDLXwcagfzTtV oEb5VYZR78t+wx/KXx/JR4GqEv5mfsfoctwXRoK8xtSA2z+S90XYy6oR26WTiBFrF8On rlU9QBsTNqqrpvZs2XDfJWfD8AE8x0f3fOo1Mnfvbi4jed1P2gElmnEmR9Dws6wgbHnv DCrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WBk+kqWjekKqi3COi7ggFtY/nxu0hDoWDiSLXyCtwJ0=; b=uO3dfxTbeowhwK/Bm2xI3pFrqp4YKVy8UZiBiVXbtjYAAFvfGS/38hG/Nb9nOylYoJ +AYVOm7uwlJ76r7fgaqVNxBFK3vIIF8AjsrD9CFfK7LMtmRngVgS9RsBUyo5LQkbrRky ZAp6Z6U3BWqfFZEKOYeuD98tucWPVgpeF5iEQ1s0r6rKxKySw2NoDNy5zPgifNuRjAdt eyYh9K77H6x6GQmVCjhltsecJi1U+3pHKlz1pdLdwmsbkpcqJqF4lQ5TN3AbfNr63ZnP +W+F3ywgu2HUeRl4PBnnhlwRVSB05KK1lrf8zsFIRVlDEHIyWleyFotJQS+M5flUhsq2 tqeQ== X-Gm-Message-State: AOAM531CUolcrj02caSoUKnf/JPistbciblR74RcSo3UVnPmLLeQMwHr kM6vaJZDiEu4UqJCNpHwFi8Ybr0yHsk= X-Google-Smtp-Source: ABdhPJxWc0ctmT4blIk9efyhXbm1skW7VSAh7H3jwDtKDUv0UyjrGfit3o8NWwo+aR1GXyAhtoQ94Q== X-Received: by 2002:a17:902:8c98:b0:15f:3e78:dc43 with SMTP id t24-20020a1709028c9800b0015f3e78dc43mr266117plo.120.1652280507833; Wed, 11 May 2022 07:48:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n17-20020a170903111100b0015e8d4eb2c6sm2059020plh.272.2022.05.11.07.48.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 May 2022 07:48:27 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 May 2022 22:48:18 +0800 Message-Id: <1652280498-10408-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652280498-10408-1-git-send-email-lance.lmwang@gmail.com> References: <1652280498-10408-1-git-send-email-lance.lmwang@gmail.com> Subject: [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 Cc: Limin Wang MIME-Version: 1.0 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: 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 _______________________________________________ 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".