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 ESMTPS id D64C349436 for ; Tue, 28 Jan 2025 17:48:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C7E768B944; Tue, 28 Jan 2025 19:48:17 +0200 (EET) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E30468B887 for ; Tue, 28 Jan 2025 19:48:11 +0200 (EET) Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-46b1d40ac6bso52688441cf.0 for ; Tue, 28 Jan 2025 09:48:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738086490; x=1738691290; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=o6h4xcPxRH72ZyDJs3cnTihEgZm3YoEQKihnOLgXO0U=; b=WahM3czIvxLLeF2hyFJp/ytZuKfgbUD6xQ0GCKD6FcRyJ5wpkSp1/KgpZFMBv1lSxy 0TP18RR+WD0jfZHsYU8KMwPhtGhCagaDXD/KlzPCI1TIzDUjrGGE7YQwndFNPKImySYA kQer0/L9ske59qI6FlUuR9fvuRxKcJbo7KOUTBiZl/T+bbHCafeCNVbeJDw8RGD3YMfs c6RY7Vo5Gz5BO0f7ZKT8jFgVkJ+QeBv/jiAmiW2WtqoEHktYA/Ab3UHC9SMpDhQkeqhk mODe5wWlCw4ES/JCnvTVIWRytmeErnqtKIsYVjuSpe+MomrVhIRNGd09gX4Dpy73qZwv aCiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738086490; x=1738691290; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o6h4xcPxRH72ZyDJs3cnTihEgZm3YoEQKihnOLgXO0U=; b=SOc70sFLcgiLpR9sBNPChz0+SW7yfovhNbYBcnIFpT1d2mA8TCK19dok9pnI6ry4JQ 6MJUY39bhDptpZ2kDXJAMyioeeNOU6YoW0Gqvzxv/+VFKyHH7qK4iK1YyL2n/aEQNuEt R0zre+5lFPHt2xz4hpmvOsWz6epK9YS2UUKPw9nqyn5yADCTaFeUEey/QLULHDZozTKL ALVA3pzVReJYsSQyUsRyQs/TkfijWD5nU2NFpISKNdtZg9owJru86GlxfOQieMIB1aoN /xegQ0qn4ww3YhSOYvDgk0aFWNSOwF32iCemAgaJ72Xx9Cy4MQGKOrVIubn7eVpa+kcs GCRA== X-Gm-Message-State: AOJu0YzA9Yine0UVhESpN73nFMAeNsRqi5bNy/WGbeKM/kysHko4OcKJ aSv1TiddqSOzDdSxqTyccVhSEvWrdgWuoTIBFXFdyai6fDGu2YGgz7PnG/QD X-Gm-Gg: ASbGnctNygT56XTvKbq25aFlX+Mbn9tyhPk1SB0lzS8aG0AKBSPwrGOdzvabOkpso6j CLs76g12DG8Q47uiQCYkT8sHsZcpQ4k0e0Rkz3S8U1M2GxjvHXu56/evuJld/pPNZLM7roFPRSy U+a8/Vzs9cJ8C8vPHJXyncDpI0f2ORNdNYdQbQxIeeT0ztV5wfHVwHnyosbCeZ9XPPszYAJG1oU o/Vc+V6NHh0AGuMHXhsRa8z9yZKEVPr2OHfbsxOlYfRrL28TxvK427E9kvhfJ46yRTMBhgd/73l glJxY3kHJFfwTnU67Pk1G9K/PapCNE2+OstwwlFrzp7Uo6gmSSbhskvZ8N31ipkZlLTE6rg= X-Google-Smtp-Source: AGHT+IGGrOPpm4cgjsq5nilg3jDhxIBVAbgP2WzIQpUIsp1LcLDakKvWI0nMmgx0rcsnGrAm75e2Uw== X-Received: by 2002:a05:622a:6206:b0:46c:82dd:9a69 with SMTP id d75a77b69052e-46fc4a77c26mr69832681cf.19.1738086490181; Tue, 28 Jan 2025 09:48:10 -0800 (PST) Received: from [192.168.1.35] (104-184-204-59.lightspeed.livnmi.sbcglobal.net. [104.184.204.59]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e2058c3780sm47637626d6.114.2025.01.28.09.48.09 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2025 09:48:09 -0800 (PST) Message-ID: Date: Tue, 28 Jan 2025 12:48:08 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: FFmpeg Development References: <20250121123401.197627-1-leo.izen@gmail.com> Content-Language: en-US-large From: Leo Izen Autocrypt: addr=leo.izen@gmail.com; keydata= xjMEZZw8HxYJKwYBBAHaRw8BAQdAgcfI+LbtjWarA7LQu6/WAPlKkn9tn4HalmHgGVhMUdzN KkxlbyBJemVuIChUcmFuZXB0b3JhKSA8bGVvLml6ZW5AZ21haWwuY29tPsKTBBMWCgA7FiEE HYMKC85GcJ4gOyb8dk5I6kgiGDMFAmWcPB8CGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcC F4AACgkQdk5I6kgiGDOnGAEA+oJFwblAblnhK+T5a5EuEbXMTZG4FkYTYz0VmjJ0NHIA/Rn9 ZE9+EEsH8fmT0hRJSiM3+zbkwQJA9gVVYAek9kMKzjgEZZw8HxIKKwYBBAGXVQEFAQEHQDes 4thejF9AU2rkGuDuut3CQYwB4SVpI4EzU8uvPJgfAwEIB8J4BBgWCgAgFiEEHYMKC85GcJ4g Oyb8dk5I6kgiGDMFAmWcPB8CGwwACgkQdk5I6kgiGDOv3QD+PLXrL0Ihk675Ip5FG+VJOodN 6e+5n3iYC6wJ75eqG3EA/1nCywoGXlCYuzXgq3el6NOn+8awwaXcTVJFzZCRbe8M In-Reply-To: <20250121123401.197627-1-leo.izen@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] avutil/frame: check return value for cropping offsets 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 1/21/25 7:34 AM, Leo Izen wrote: > This function can return AVERROR_BUG in theory if something > went wrong, but so can the caller, so we should propagate that > error message upward in that case. > > Signed-off-by: Leo Izen > --- > libavutil/frame.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/libavutil/frame.c b/libavutil/frame.c > index 10b59545f0..89c200bcc2 100644 > --- a/libavutil/frame.c > +++ b/libavutil/frame.c > @@ -1095,6 +1095,7 @@ int av_frame_apply_cropping(AVFrame *frame, int flags) > { > const AVPixFmtDescriptor *desc; > size_t offsets[4]; > + int ret; > > if (!(frame->width > 0 && frame->height > 0)) > return AVERROR(EINVAL); > @@ -1122,7 +1123,9 @@ int av_frame_apply_cropping(AVFrame *frame, int flags) > } > > /* calculate the offsets for each plane */ > - calc_cropping_offsets(offsets, frame, desc); > + ret = calc_cropping_offsets(offsets, frame, desc); > + if (ret < 0) > + return ret; > > /* adjust the offsets to avoid breaking alignment */ > if (!(flags & AV_FRAME_CROP_UNALIGNED)) { > @@ -1141,7 +1144,9 @@ int av_frame_apply_cropping(AVFrame *frame, int flags) > > if (min_log2_align < 5 && log2_crop_align != INT_MAX) { > frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1); > - calc_cropping_offsets(offsets, frame, desc); > + ret = calc_cropping_offsets(offsets, frame, desc); > + if (ret < 0) > + return ret; > } > } > Will apply. - Leo Izen (Traneptora) _______________________________________________ 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".