rtsp-server: Fix memory leaks when context parse fails

When g_option_context_parse fails, context and error variables are not getting free'd
which results in memory leaks. Free'ing the same.

And replacing g_error_free with g_clear_error, which checks if the error being passed
is not NULL and sets the variable to NULL on free'ing.

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

diff --git a/examples/test-launch.c b/examples/test-launch.c
index 24e1271..03bcd41 100644 (file)
--- a/examples/test-launch.c
+++ b/examples/test-launch.c
@@ -47,6 +47,8 @@ main (int argc, char *argv[])
   g_option_context_add_group (optctx, gst_init_get_option_group ());
   if (!g_option_context_parse (optctx, &argc, &argv, &error)) {
     g_printerr ("Error parsing options: %s\n", error->message);
+    g_option_context_free (optctx);
+    g_clear_error (&error);
     return -1;
   }
   g_option_context_free (optctx);

diff --git a/examples/test-mp4.c b/examples/test-mp4.c
index 9bcaab4..34b8906 100644 (file)
--- a/examples/test-mp4.c
+++ b/examples/test-mp4.c
@@ -102,6 +102,8 @@ main (int argc, char *argv[])
   g_option_context_add_group (optctx, gst_init_get_option_group ());
   if (!g_option_context_parse (optctx, &argc, &argv, &error)) {
     g_printerr ("Error parsing options: %s\n", error->message);
+    g_option_context_free (optctx);
+    g_clear_error (&error);
     return -1;
   }
 

diff --git a/examples/test-ogg.c b/examples/test-ogg.c
index c22e638..dc052b4 100644 (file)
--- a/examples/test-ogg.c
+++ b/examples/test-ogg.c
@@ -47,6 +47,8 @@ main (int argc, char *argv[])
   g_option_context_add_group (optctx, gst_init_get_option_group ());
   if (!g_option_context_parse (optctx, &argc, &argv, &error)) {
     g_printerr ("Error parsing options: %s\n", error->message);
+    g_option_context_free (optctx);
+    g_clear_error (&error);
     return -1;
   }
   g_option_context_free (optctx);

diff --git a/examples/test-record.c b/examples/test-record.c
index 1c37503..edd66ad 100644 (file)
--- a/examples/test-record.c
+++ b/examples/test-record.c
@@ -49,6 +49,8 @@ main (int argc, char *argv[])
   g_option_context_add_group (optctx, gst_init_get_option_group ());
   if (!g_option_context_parse (optctx, &argc, &argv, &error)) {
     g_printerr ("Error parsing options: %s\n", error->message);
+    g_option_context_free (optctx);
+    g_clear_error (&error);
     return -1;
   }
 

diff --git a/examples/test-uri.c b/examples/test-uri.c
index 8a9c56c..784bf9a 100644 (file)
--- a/examples/test-uri.c
+++ b/examples/test-uri.c
@@ -76,6 +76,8 @@ main (int argc, gchar * argv[])
   g_option_context_add_group (optctx, gst_init_get_option_group ());
   if (!g_option_context_parse (optctx, &argc, &argv, &error)) {
     g_printerr ("Error parsing options: %s\n", error->message);
+    g_option_context_free (optctx);
+    g_clear_error (&error);
     return -1;
   }
   g_option_context_free (optctx);