fix svace issue 46/78246/2 accepted/tizen/common/20160706.141807 accepted/tizen/ivi/20160706.013733 accepted/tizen/mobile/20160706.013624 accepted/tizen/tv/20160706.013658 accepted/tizen/wearable/20160706.013713 submit/tizen/20160705.084920
authorEunhae Choi <eunhae1.choi@samsung.com>
Tue, 5 Jul 2016 01:36:46 +0000 (10:36 +0900)
committerEunhae Choi <eunhae1.choi@samsung.com>
Tue, 5 Jul 2016 02:38:03 +0000 (11:38 +0900)
Change-Id: Ifdf71e836967ca6d439160cb2c4bae3e5775a4b9

packaging/capi-media-streamer.spec
src/media_streamer_gst.c [changed mode: 0755->0644]

index 2d80ef8522b2b512206e2fb72c0f86d363c9ebc3..8430faa228ebe67225347797b4cd27160ce98fb7 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer library in Tizen Native API
-Version:    0.1.4
+Version:    0.1.5
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
old mode 100755 (executable)
new mode 100644 (file)
index 3caba9e..7bfb032
@@ -1745,6 +1745,12 @@ int __ms_element_pull_packet(GstElement *sink_element, media_packet_h *packet)
                GstMapInfo map;
                guint8 *buffer_res = NULL;
                GstBuffer *buffer = gst_sample_get_buffer(sample);
+               if (!buffer) {
+                       ms_error("Failed to get buffer from sample");
+                       media_format_unref(fmt);
+                       gst_sample_unref(sample);
+                       return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+               }
                gst_buffer_map(buffer, &map, GST_MAP_READ);
 
                buffer_res = (guint8 *) malloc(map.size * sizeof(guint8));
@@ -1755,8 +1761,6 @@ int __ms_element_pull_packet(GstElement *sink_element, media_packet_h *packet)
                        media_packet_set_pts(*packet, GST_BUFFER_PTS(buffer));
                        media_packet_set_dts(*packet, GST_BUFFER_DTS(buffer));
                        media_packet_set_pts(*packet, GST_BUFFER_DURATION(buffer));
-
-                       media_format_unref(fmt);
                } else {
                        ms_error("Error allocation memory for packet data");
                        ret = MEDIA_STREAMER_ERROR_INVALID_OPERATION;
@@ -1764,6 +1768,7 @@ int __ms_element_pull_packet(GstElement *sink_element, media_packet_h *packet)
                gst_buffer_unmap(buffer, &map);
        }
 
+       media_format_unref(fmt);
        gst_sample_unref(sample);
        return ret;
 }