source: fix memory leak & null pointer dereference

- Allocations via g_malloc were not cleaned up when prepare_elements
  returned, so use g_free to free the "elem" resource.
- Fix null pointer dereference bugs.

Change-Id: I07345cbb084cc050337c87e67860b185fd976cc9
Signed-off-by: Park Kyoung Won <kw0712.park@samsung.com>

diff --git a/src/gstmaruaudenc.c b/src/gstmaruaudenc.c
index d58afeb..cd7d939 100644 (file)
--- a/src/gstmaruaudenc.c
+++ b/src/gstmaruaudenc.c
@@ -292,9 +292,11 @@ gst_maruaudenc_set_format (GstAudioEncoder *encoder, GstAudioInfo *info)
   */
   if (!maruaudenc->context) {
     GST_ERROR("ctx NULL");
+    return FALSE;
   }
   if (!maruaudenc->context->codec) {
     GST_ERROR("codec NULL");
+    return FALSE;
   }
   gst_maru_audioinfo_to_context (info, maruaudenc->context);
 

diff --git a/src/gstmaruinterface3.c b/src/gstmaruinterface3.c
index 68e4fbb..616212c 100644 (file)
--- a/src/gstmaruinterface3.c
+++ b/src/gstmaruinterface3.c
@@ -680,6 +680,7 @@ prepare_elements (int fd)
     elements = g_list_append (elements, &elem[i]);
   }
 
+  g_free (elem);
   return elements;
 }
 

diff --git a/src/gstmaruviddec.c b/src/gstmaruviddec.c
index f8579c0..97f78ca 100644 (file)
--- a/src/gstmaruviddec.c
+++ b/src/gstmaruviddec.c
@@ -354,11 +354,11 @@ gst_marudec_set_format (GstVideoDecoder * decoder, GstVideoCodecState * state)
   gboolean ret = FALSE;
 
   marudec = (GstMaruVidDec *) decoder;
-  oclass = (GstMaruVidDecClass *) (G_OBJECT_GET_CLASS (marudec));
   if (!marudec) {
       GST_ERROR ("invalid marudec");
     return FALSE;
   }
+  oclass = (GstMaruVidDecClass *) (G_OBJECT_GET_CLASS (marudec));
   if (marudec->last_caps != NULL &&
       gst_caps_is_equal (marudec->last_caps, state->caps)) {
     return TRUE;