Resolve memory related and unreachable code issue

Change-Id: Id93d689e9f4766e9db1a90f7d046c9cad0f90f69
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/packaging/gst-plugins-tizen.spec b/packaging/gst-plugins-tizen.spec
index e0b1aae..2582490 100644 (file)
--- a/packaging/gst-plugins-tizen.spec
+++ b/packaging/gst-plugins-tizen.spec
@@ -5,7 +5,7 @@
 Name:       gst-plugins-tizen
 Version:    1.0.0
 Summary:    GStreamer tizen plugins (common)
-Release:    97
+Release:    98
 Group:      Multimedia/Framework
 Url:        http://gstreamer.freedesktop.org/
 License:    LGPL-2.1+

diff --git a/waylandsrc/src/gstwaylandsrc.c b/waylandsrc/src/gstwaylandsrc.c
index 7f382f6..0973c46 100644 (file)
--- a/waylandsrc/src/gstwaylandsrc.c
+++ b/waylandsrc/src/gstwaylandsrc.c
@@ -584,7 +584,7 @@ destroy_buffer (struct output_buffer *obuffer)
     munmap (obuffer->data, obuffer->size);
 
   wl_list_remove (&obuffer->link);
-  free (obuffer);
+  g_free (obuffer);
 }
 
 static struct output_buffer *

diff --git a/wfdmanager/wfdbase/gstwfdsinkmessage.c b/wfdmanager/wfdbase/gstwfdsinkmessage.c
index 85be43d..e4d1bb3 100644 (file)
--- a/wfdmanager/wfdbase/gstwfdsinkmessage.c
+++ b/wfdmanager/wfdbase/gstwfdsinkmessage.c
@@ -971,11 +971,11 @@ gst_wfd_parse_line(GstWFDMessage *msg, gchar *buffer)
         GST_WFD_SKIP_SPACE(v);
         if (msg->display_edid->edid_block_count) {
           gchar *edid_string = v;
-          int i = 0, j = 0, size = 0;
+          guint32 i = 0, j = 0, msg_size = 0;
           guint32 payload_size = EDID_BLOCK_SIZE * msg->display_edid->edid_block_count;
           msg->display_edid->edid_payload = g_malloc(payload_size);
-          size = EDID_BLOCK_SIZE * msg->display_edid->edid_block_count * 2;
-          for (; i < size; j++) {
+          msg_size = payload_size * 2;
+          for (; i < msg_size; j++) {
             int k = 0, kk = 0;
             if (edid_string[i] > 0x29 && edid_string[i] < 0x40) k = edid_string[i] - 48;
             else if (edid_string[i] > 0x60 && edid_string[i] < 0x67) k = edid_string[i] - 87;
@@ -989,7 +989,7 @@ gst_wfd_parse_line(GstWFDMessage *msg, gchar *buffer)
             i += 2;
           }
           /*memcpy(msg->display_edid->edid_payload, v, payload_size); */
-          v += (payload_size * 2);
+          v += msg_size;
         } else v += strlen(v);
       }
     }

diff --git a/wfdmanager/wfdbase/gstwfdsinkmessage.h b/wfdmanager/wfdbase/gstwfdsinkmessage.h
index 3ff452f..350bae4 100644 (file)
--- a/wfdmanager/wfdbase/gstwfdsinkmessage.h
+++ b/wfdmanager/wfdbase/gstwfdsinkmessage.h
@@ -416,7 +416,7 @@ typedef struct {
 
 typedef struct {
   guint edid_supported;
-  guint edid_block_count;
+  gushort edid_block_count;
   gchar *edid_payload;
 } GstWFDDisplayEdid;
 

diff --git a/wfdtsdemux/wfdtsdemux.c b/wfdtsdemux/wfdtsdemux.c
index b55a8ac..f5893d0 100644 (file)
--- a/wfdtsdemux/wfdtsdemux.c
+++ b/wfdtsdemux/wfdtsdemux.c
@@ -1624,11 +1624,9 @@ check_pending_buffers (GstWFDTSDemux * demux)
     guint64 firstval, lastval, ts;
 
     /* 3.1 Calculate the offset between current DTS and first DTS */
+    /* If we don't have any pending data, the offset is 0 for this stream */
     if (tmpstream->pending == NULL || tmpstream->state == PENDING_PACKET_EMPTY)
       continue;
-    /* If we don't have any pending data, the offset is 0 for this stream */
-    if (tmpstream->pending == NULL)
-      break;
     if (tmpstream->raw_dts != -1)
       lastval = tmpstream->raw_dts;
     else if (tmpstream->raw_pts != -1)