From: Sebastian Dröge <sebastian@centricular.com>
Date: Thu, 18 Feb 2016 09:09:36 +0000 (+0200)
Subject: buffer: Protect against failing to map input memory when merging memories
X-Git-Tag: 1.10.4~408
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5664fd7635679016714a40a521b1622fbc636418;p=platform%2Fupstream%2Fgstreamer.git

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

https://bugzilla.gnome.org/show_bug.cgi?id=762239
---

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index db4a237..0ee8bf3 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -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",