File CVE-2024-47599.patch of Package gstreamer-plugins-good.36926

From 3cdf206f4fc5a9860bfe1437ed3d01e7d23c6c3e 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] 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/8040>
---
diff -urp gst-plugins-good-1.8.3.orig/ext/jpeg/gstjpegdec.c gst-plugins-good-1.8.3/ext/jpeg/gstjpegdec.c
--- gst-plugins-good-1.8.3.orig/ext/jpeg/gstjpegdec.c	2016-06-08 06:53:02.000000000 -0400
+++ gst-plugins-good-1.8.3/ext/jpeg/gstjpegdec.c	2024-12-18 17:35:42.979024672 -0500
@@ -920,12 +920,13 @@ format_not_supported:
   }
 }
 
-static void
+static gboolean
 gst_jpeg_dec_negotiate (GstJpegDec * dec, gint width, gint height, gint clrspc)
 {
   GstVideoCodecState *outstate;
   GstVideoInfo *info;
   GstVideoFormat format;
+  gboolean res;
 
   switch (clrspc) {
     case JCS_RGB:
@@ -948,7 +949,7 @@ gst_jpeg_dec_negotiate (GstJpegDec * dec
         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);
   }
@@ -956,6 +957,8 @@ gst_jpeg_dec_negotiate (GstJpegDec * dec
   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:
@@ -971,10 +974,12 @@ gst_jpeg_dec_negotiate (GstJpegDec * dec
 
   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
@@ -1089,7 +1094,8 @@ gst_jpeg_dec_handle_frame (GstVideoDecod
           height < MIN_HEIGHT || height > MAX_HEIGHT))
     goto wrong_size;
 
-  gst_jpeg_dec_negotiate (dec, width, height, dec->cinfo.jpeg_color_space);
+  if (!gst_jpeg_dec_negotiate (dec, width, height, dec->cinfo.jpeg_color_space))
+    goto negotiation_failed;
 
   state = gst_video_decoder_get_output_state (bdec);
   ret = gst_video_decoder_allocate_output_frame (bdec, frame);
@@ -1183,6 +1189,12 @@ wrong_size:
     ret = GST_FLOW_ERROR;
     goto done;
   }
+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];