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

exiftag: Prevent integer overflows and out of bounds reads when handling undefined tags

Browse source 
Fixes ZDI-CAN-23896
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3483

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6767>
This commit is contained in:
Sebastian Dröge 2024-04-25 15:21:20 +03:00 committed by Tim-Philipp Müller
parent 810876d3d4
commit 1ceedfd2c1
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
subprojects/gst-plugins-base/gst-libs/gst/tag/gstexiftag.c
View file

@ -1383,6 +1383,7 @@ parse_exif_undefined_tag (GstExifReader * reader, const GstExifTagMatch * tag,
if (count > 4) { if (count > 4) {
GstMapInfo info; GstMapInfo info;
gsize alloc_size;
if (offset < reader->base_offset) { if (offset < reader->base_offset) {
GST_WARNING ("Offset is smaller (%u) than base offset (%u)", offset, GST_WARNING ("Offset is smaller (%u) than base offset (%u)", offset,
@ -1404,14 +1405,28 @@ parse_exif_undefined_tag (GstExifReader * reader, const GstExifTagMatch * tag,
return; return;
} }
if (info.size - real_offset < count) {
GST_WARNING ("Invalid size %u for buffer of size %" G_GSIZE_FORMAT
", not adding tag %s", count, info.size, tag->gst_tag);
gst_buffer_unmap (reader->buffer, &info);
return;
}
if (!g_size_checked_add (&alloc_size, count, 1)) {
GST_WARNING ("Invalid size %u for buffer of size %" G_GSIZE_FORMAT
", not adding tag %s", real_offset, info.size, tag->gst_tag);
gst_buffer_unmap (reader->buffer, &info);
return;
}
/* +1 because it could be a string without the \0 */ /* +1 because it could be a string without the \0 */
data = malloc (sizeof (guint8) * count + 1); data = malloc (alloc_size);
memcpy (data, info.data + real_offset, count); memcpy (data, info.data + real_offset, count);
data[count] = 0; data[count] = 0;
gst_buffer_unmap (reader->buffer, &info); gst_buffer_unmap (reader->buffer, &info);
} else { } else {
data = malloc (sizeof (guint8) * count + 1); data = malloc (count + 1);
memcpy (data, (guint8 *) offset_as_data, count); memcpy (data, (guint8 *) offset_as_data, count);
data[count] = 0; data[count] = 0;
} }