mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmp2: guard against calling gst_amf_node_get_type() with NULL

Browse source 
gst_amf_node_get_type() raises a CRITICAL if called with a NULL node.
All callers were checking for this except those.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7103>
This commit is contained in:
Guillaume Desmottes 2024-06-26 16:09:26 +02:00 committed by GStreamer Marge Bot
parent 84b3a0950d
commit 037d36f28d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-bad/gst/rtmp2/rtmp/amf.c
View file

@ -903,7 +903,7 @@ gst_amf_node_parse (const guint8 * data, gsize size, guint8 ** endptr)
GST_TRACE ("Starting parse with %" G_GSIZE_FORMAT " bytes", parser.size); GST_TRACE ("Starting parse with %" G_GSIZE_FORMAT " bytes", parser.size);
node = parse_value (&parser); node = parse_value (&parser);
if (gst_amf_node_get_type (node) == GST_AMF_TYPE_INVALID) { if (!node || gst_amf_node_get_type (node) == GST_AMF_TYPE_INVALID) {
GST_ERROR ("invalid value"); GST_ERROR ("invalid value");
goto out; goto out;
} }
@ -946,13 +946,13 @@ gst_amf_parse_command (const guint8 * data, gsize size,
GST_TRACE ("Starting parse with %" G_GSIZE_FORMAT " bytes", parser.size); GST_TRACE ("Starting parse with %" G_GSIZE_FORMAT " bytes", parser.size);
node1 = parse_value (&parser); node1 = parse_value (&parser);
if (gst_amf_node_get_type (node1) != GST_AMF_TYPE_STRING) { if (!node1 || gst_amf_node_get_type (node1) != GST_AMF_TYPE_STRING) {
GST_ERROR ("no command name"); GST_ERROR ("no command name");
goto out; goto out;
} }
node2 = parse_value (&parser); node2 = parse_value (&parser);
if (gst_amf_node_get_type (node2) != GST_AMF_TYPE_NUMBER) { if (!node2 || gst_amf_node_get_type (node2) != GST_AMF_TYPE_NUMBER) {
GST_ERROR ("no transaction ID"); GST_ERROR ("no transaction ID");
goto out; goto out;
} }