96 lines
3.2 KiB
Diff
96 lines
3.2 KiB
Diff
|
From 51a811cf18db7aa70704a1b4c0a6fac9512d94ae Mon Sep 17 00:00:00 2001
|
||
|
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||
|
Date: Mon, 30 Sep 2024 16:22:19 +0300
|
||
|
Subject: [PATCH 28/28] jpegdec: Directly error out on negotiation failures
|
||
|
|
||
|
Thanks to Antonio Morales for finding and reporting the issue.
|
||
|
|
||
|
Fixes GHSL-2024-247
|
||
|
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3862
|
||
|
|
||
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8102>
|
||
|
---
|
||
|
.../gst-plugins-good/ext/jpeg/gstjpegdec.c | 22 ++++++++++++++-----
|
||
|
1 file changed, 17 insertions(+), 5 deletions(-)
|
||
|
|
||
|
diff --git a/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c b/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
|
||
|
index 452747d157..4e41248e52 100644
|
||
|
--- a/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
|
||
|
+++ b/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
|
||
|
@@ -1068,13 +1068,14 @@ gst_jpeg_turbo_parse_ext_fmt_convert (GstJpegDec * dec, gint * clrspc)
|
||
|
}
|
||
|
#endif
|
||
|
|
||
|
-static void
|
||
|
+static gboolean
|
||
|
gst_jpeg_dec_negotiate (GstJpegDec * dec, gint width, gint height, gint clrspc,
|
||
|
gboolean interlaced)
|
||
|
{
|
||
|
GstVideoCodecState *outstate;
|
||
|
GstVideoInfo *info;
|
||
|
GstVideoFormat format;
|
||
|
+ gboolean res;
|
||
|
|
||
|
#ifdef JCS_EXTENSIONS
|
||
|
if (dec->format_convert) {
|
||
|
@@ -1104,7 +1105,7 @@ gst_jpeg_dec_negotiate (GstJpegDec * dec, gint width, gint height, gint clrspc,
|
||
|
height == GST_VIDEO_INFO_HEIGHT (info) &&
|
||
|
format == GST_VIDEO_INFO_FORMAT (info)) {
|
||
|
gst_video_codec_state_unref (outstate);
|
||
|
- return;
|
||
|
+ return TRUE;
|
||
|
}
|
||
|
gst_video_codec_state_unref (outstate);
|
||
|
}
|
||
|
@@ -1118,6 +1119,8 @@ gst_jpeg_dec_negotiate (GstJpegDec * dec, gint width, gint height, gint clrspc,
|
||
|
outstate =
|
||
|
gst_video_decoder_set_output_state (GST_VIDEO_DECODER (dec), format,
|
||
|
width, height, dec->input_state);
|
||
|
+ if (!outstate)
|
||
|
+ return FALSE;
|
||
|
|
||
|
switch (clrspc) {
|
||
|
case JCS_RGB:
|
||
|
@@ -1142,10 +1145,12 @@ gst_jpeg_dec_negotiate (GstJpegDec * dec, gint width, gint height, gint clrspc,
|
||
|
|
||
|
gst_video_codec_state_unref (outstate);
|
||
|
|
||
|
- gst_video_decoder_negotiate (GST_VIDEO_DECODER (dec));
|
||
|
+ res = gst_video_decoder_negotiate (GST_VIDEO_DECODER (dec));
|
||
|
|
||
|
GST_DEBUG_OBJECT (dec, "max_v_samp_factor=%d", dec->cinfo.max_v_samp_factor);
|
||
|
GST_DEBUG_OBJECT (dec, "max_h_samp_factor=%d", dec->cinfo.max_h_samp_factor);
|
||
|
+
|
||
|
+ return res;
|
||
|
}
|
||
|
|
||
|
static GstFlowReturn
|
||
|
@@ -1425,8 +1430,9 @@ gst_jpeg_dec_handle_frame (GstVideoDecoder * bdec, GstVideoCodecFrame * frame)
|
||
|
num_fields = 1;
|
||
|
}
|
||
|
|
||
|
- gst_jpeg_dec_negotiate (dec, width, output_height,
|
||
|
- dec->cinfo.jpeg_color_space, num_fields == 2);
|
||
|
+ if (!gst_jpeg_dec_negotiate (dec, width, output_height,
|
||
|
+ dec->cinfo.jpeg_color_space, num_fields == 2))
|
||
|
+ goto negotiation_failed;
|
||
|
|
||
|
state = gst_video_decoder_get_output_state (bdec);
|
||
|
ret = gst_video_decoder_allocate_output_frame (bdec, frame);
|
||
|
@@ -1558,6 +1564,12 @@ map_failed:
|
||
|
ret = GST_FLOW_ERROR;
|
||
|
goto exit;
|
||
|
}
|
||
|
+negotiation_failed:
|
||
|
+ {
|
||
|
+ GST_ELEMENT_ERROR (dec, CORE, NEGOTIATION, (NULL), ("failed to negotiate"));
|
||
|
+ ret = GST_FLOW_NOT_NEGOTIATED;
|
||
|
+ goto exit;
|
||
|
+ }
|
||
|
decode_error:
|
||
|
{
|
||
|
gchar err_msg[JMSG_LENGTH_MAX];
|
||
|
--
|
||
|
2.47.0
|
||
|
|