From 09f55bf3d1fdcac06c5d297bb27cb4f3e7f85021 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Thu, 5 Oct 2023 08:45:16 +0200 Subject: [PATCH] Ensure qtblend doesn't request an image of 0 width or height (crashes many filters) --- src/modules/qt/filter_qtblend.cpp | 6 +++--- src/modules/qt/transition_qtblend.cpp | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/qt/filter_qtblend.cpp b/src/modules/qt/filter_qtblend.cpp index d54f7ccad..32d752d60 100644 --- a/src/modules/qt/filter_qtblend.cpp +++ b/src/modules/qt/filter_qtblend.cpp @@ -103,10 +103,10 @@ static int filter_get_image(mlt_frame frame, || rect.h != *height; if (mlt_properties_get_int(properties, "distort") == 0) { - b_height = qMin((int) rect.h, b_height); - b_width = b_height * b_dar / b_ar / consumer_ar; + b_height = qMax(1, qMin((int) rect.h, b_height)); + b_width = qMax(1, int(b_height * b_dar / b_ar / consumer_ar)); } else { - b_width *= b_ar / consumer_ar; + b_width = qMax(1, int(b_width * b_ar / consumer_ar)); } if (!hasAlpha && (b_width < *width || b_height < *height)) { hasAlpha = true; diff --git a/src/modules/qt/transition_qtblend.cpp b/src/modules/qt/transition_qtblend.cpp index 9dbc795aa..0b41b3ff8 100644 --- a/src/modules/qt/transition_qtblend.cpp +++ b/src/modules/qt/transition_qtblend.cpp @@ -121,6 +121,9 @@ static int get_image(mlt_frame a_frame, // we will process operations on top frame, so also process b_frame forceAlpha = true; } + // Ensure we don't request an image with a 0 width or height + b_width = qMax(1, b_width); + b_height = qMax(1, b_height); } else { b_height = *height; b_width = *width;