mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

id3v2: Don't try parsing extended header if not enough data is available

Browse source 
Thanks to Antonio Morales for finding and reporting the issue.

Fixes GHSL-2024-235
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3842

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8033>
This commit is contained in:
Sebastian Dröge 2024-09-26 13:43:06 +03:00 committed by GStreamer Marge Bot
parent f8e398c46f
commit 537161868f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subprojects/gst-plugins-base/gst-libs/gst/tag/id3v2.c
View file

@ -29,7 +29,7 @@
#define HANDLE_INVALID_SYNCSAFE #define HANDLE_INVALID_SYNCSAFE
static gboolean id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size); static gboolean id3v2_frames_to_tag_list (ID3TagsWorking * work);
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
@ -258,7 +258,7 @@ gst_tag_list_from_id3v2_tag (GstBuffer * buffer)
GST_MEMDUMP ("ID3v2 tag (un-unsyced)", uu_data, work.hdr.frame_data_size); GST_MEMDUMP ("ID3v2 tag (un-unsyced)", uu_data, work.hdr.frame_data_size);
} }
id3v2_frames_to_tag_list (&work, work.hdr.frame_data_size); id3v2_frames_to_tag_list (&work);
g_free (uu_data); g_free (uu_data);
@ -440,12 +440,17 @@ id3v2_add_id3v2_frame_blob_to_taglist (ID3TagsWorking * work,
} }
static gboolean static gboolean
id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size) id3v2_frames_to_tag_list (ID3TagsWorking * work)
{ {
guint frame_hdr_size; guint frame_hdr_size;
/* Extended header if present */ /* Extended header if present */
if (work->hdr.flags & ID3V2_HDR_FLAG_EXTHDR) { if (work->hdr.flags & ID3V2_HDR_FLAG_EXTHDR) {
if (work->hdr.frame_data_size < 4) {
GST_DEBUG ("Tag has no extended header data. Broken tag");
return FALSE;
}
work->hdr.ext_hdr_size = id3v2_read_synch_uint (work->hdr.frame_data, 4); work->hdr.ext_hdr_size = id3v2_read_synch_uint (work->hdr.frame_data, 4);
/* In id3v2.4.x the header size is the size of the *whole* /* In id3v2.4.x the header size is the size of the *whole*