mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-11 02:46:33 +00:00
exiftag: Prevent integer overflows and out of bounds reads when handling undefined tags
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:
parent
810876d3d4
commit
1ceedfd2c1
1 changed files with 17 additions and 2 deletions
|
@ -1383,6 +1383,7 @@ parse_exif_undefined_tag (GstExifReader * reader, const GstExifTagMatch * tag,
|
|||
|
||||
if (count > 4) {
|
||||
GstMapInfo info;
|
||||
gsize alloc_size;
|
||||
|
||||
if (offset < reader->base_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;
|
||||
}
|
||||
|
||||
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 */
|
||||
data = malloc (sizeof (guint8) * count + 1);
|
||||
data = malloc (alloc_size);
|
||||
memcpy (data, info.data + real_offset, count);
|
||||
data[count] = 0;
|
||||
|
||||
gst_buffer_unmap (reader->buffer, &info);
|
||||
} else {
|
||||
data = malloc (sizeof (guint8) * count + 1);
|
||||
data = malloc (count + 1);
|
||||
memcpy (data, (guint8 *) offset_as_data, count);
|
||||
data[count] = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue