From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 23 Feb 2016 16:23:43 +0000 (+0100)
Subject: buffer: Check return value of gst_memory_map()
X-Git-Tag: 1.10.4~388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7cba27157f9e36c34bda2d8741be4ccb2d17d96;p=platform%2Fupstream%2Fgstreamer.git

buffer: Check return value of gst_memory_map()

Only do memory operations if the memory was succesfully map'ed

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

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 0ee8bf3..7eb3472 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -236,7 +236,12 @@ _get_merged_memory (GstBuffer * buffer, guint idx, guint length)
       guint8 *ptr;
 
       result = gst_allocator_alloc (NULL, size, NULL);
-      gst_memory_map (result, &dinfo, GST_MAP_WRITE);
+      if (result == NULL || !gst_memory_map (result, &dinfo, GST_MAP_WRITE)) {
+        GST_CAT_ERROR (GST_CAT_BUFFER, "Failed to map memory writable");
+        if (result)
+          gst_memory_unref (result);
+        return NULL;
+      }
 
       ptr = dinfo.data;
       left = size;