mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

buffer: Protect against failing to map input memory when merging memories

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=762239
This commit is contained in:
Sebastian Dröge 2016-02-18 11:09:36 +02:00
parent 17d30e944b
commit 5664fd7635
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/gstbuffer.c
View file

@ -242,7 +242,14 @@ _get_merged_memory (GstBuffer * buffer, guint idx, guint length)
left = size;
for (i = idx; i < (idx + length) && left > 0; i++) {
gst_memory_map (mem[i], &sinfo, GST_MAP_READ);
if (!gst_memory_map (mem[i], &sinfo, GST_MAP_READ)) {
GST_CAT_ERROR (GST_CAT_BUFFER,
"buffer %p, idx %u, length %u failed to map readable", buffer,
idx, length);
gst_memory_unmap (result, &dinfo);
gst_memory_unref (result);
return NULL;
}
tocopy = MIN (sinfo.size, left);
GST_CAT_DEBUG (GST_CAT_PERFORMANCE,
"memcpy %" G_GSIZE_FORMAT " bytes for merge %p from memory %p",