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 6D3D84AB7C for ; Tue, 21 Jan 2025 12:34:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC0AB68A154; Tue, 21 Jan 2025 14:34:12 +0200 (EET) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B787568081D for ; Tue, 21 Jan 2025 14:34:05 +0200 (EET) Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7b9bc648736so542321285a.1 for ; Tue, 21 Jan 2025 04:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737462844; x=1738067644; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2pTVO7A4Wct7B0j8nrSwbj9CyJOWoNJtfCwDTikM03Y=; b=kkHqGtQ6++Dw9Nxixyl7v89tspD6iKK8R/CsXliAKZR69Z+HfxfWVp2FjYQjvutUF0 0HSyquD65wcJPcd2mNp/CI2N3iffr1p5Umopv+oiHapKAa+8rJyE0uO/c1lAl4PgwDY2 TW2hsr2i04fVHva/O3g6Z7goRy5X+I9FpRySIaTyliI1pIscJWUCUBp6lJzCzAHqO4bE 4ToaY3ZHRqOqIOlhbhlm1DJqpo3tWew472oHqLrkZblOgWjFLjApmTKIEy8Z58jSWaGf SzERVTq8wbeht6SKcQOjs9esVamo96PdkZ59kXpVTFCK1InotxdPuFLPuN1CgcM3x+3E IgJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737462844; x=1738067644; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2pTVO7A4Wct7B0j8nrSwbj9CyJOWoNJtfCwDTikM03Y=; b=FtwYCf9VXHNgKSYSwoxcYgfVCmP8eDgkaIBpJl+kOJIDTP3gOYC0BWmAHzYHyEAxXX Xz4H3vdjodZB6DKGmvr9t6FZkTDZkq6JUghU9P+ViDQFjVJvePYgcCC1K+PZGcCYhmPT W+lb06KIH65vep6bwZ++RmRUmBl9gCtotAKFByGuYt/aRlb8AqWF40AC/fgPpYtFzz8Q t4wxBv/EV8nhI7vjvPs71GNN9py1ZPBtFVeRjz7liYTpT/NWpIHyqaue+gBRRKRJjeNJ dqRKeppDM3lcKkXE7zFelPq60sxKFuBYGQW5fBsllAQAGcimfkmUFrwUPsig0TYKzIFb /1SQ== X-Gm-Message-State: AOJu0YyeTQqzL1xVK1Ij/klKkHIj2pFmMIrgmf2S78tiz7XzrHNjelNM +DzdRfaw+neUzP+gN5m42hAqP5ojpU2Dpt8dsxIlaqpkG0JTPhnPmdyIUi0a X-Gm-Gg: ASbGncubd/uMMHCUVIpq+ET8oPO+/33SPMSbtE0n9SmiMAhe5b9aFcJ9FM21IzL6pU9 s7j8iYVNIKJnrO/oarDDbnZQ8T4hFXtstF1DkLHdmyG2zcKfakyOc6SpirEb7J2FqB/TOa92xJv quTmdZ/LoSG87tNCyhchhH8Z6eEYJjzc2b0Bbf1scSZOCAD+vzabDNJrIIBtgIRNAP1gmD2Kf+Y OqOyzgCAuJJlCYJFpUJTd7xUBWijKRod+1kcI+LVnk4c3KDHzsd841xwvEkJTLBdcy8pHqGLLEe CzjE4wGE0NmfCGoMHLk1ruE0FogJgooBH9aiezSrx9FjNA== X-Google-Smtp-Source: AGHT+IFvvuBInYXERA274A+6zUwpFZVliARq4Q8hBtAJx4IxwbNoGYQ8TLb93QZXa3lnqI49iR0DsQ== X-Received: by 2002:a05:620a:f03:b0:7bd:bafc:329d with SMTP id af79cd13be357-7be6324d83dmr3142514785a.40.1737462844289; Tue, 21 Jan 2025 04:34:04 -0800 (PST) Received: from gauss.local (104-184-204-59.lightspeed.livnmi.sbcglobal.net. [104.184.204.59]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be614ef4ebsm548283485a.101.2025.01.21.04.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 04:34:03 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jan 2025 07:34:01 -0500 Message-ID: <20250121123401.197627-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [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 Cc: Leo Izen 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 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; } } -- 2.48.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".