fix for "bad address " issue with wlan helper

1 files changed, 16 insertions, 5 deletions

diff --git a/src/util/helper.c b/src/util/helper.c
index 9faf2ee50..1d3edb4d2 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -136,7 +136,7 @@ struct GNUNET_HELPER_Handle
   /**
    * NULL-terminated list of command-line arguments.
    */
-  char *const *binary_argv;
+  char **binary_argv;
                     
   /**
    * Task to read from the helper.
@@ -411,11 +411,18 @@ GNUNET_HELPER_start (int with_control_pipe,
                      void *cb_cls)
 {
   struct GNUNET_HELPER_Handle*h;
-
+  int c = 0;
   h =  GNUNET_malloc (sizeof (struct GNUNET_HELPER_Handle));
   h->with_control_pipe = with_control_pipe;
-  h->binary_name = binary_name;
-  h->binary_argv = binary_argv;
+  h->binary_name = GNUNET_strdup (binary_name);
+
+  for (c = 0; binary_argv[c] != NULL; c++)
+    c ++;
+  h->binary_argv = GNUNET_malloc (sizeof (char *[c + 1]));
+  for (c = 0; binary_argv[c] != NULL; c++)
+    h->binary_argv[c] = GNUNET_strdup (binary_argv[c]);
+  h->binary_argv[c] = NULL;
+
   h->cb_cls = cb_cls;
   h->mst = GNUNET_SERVER_mst_create (cb, h->cb_cls);
   h->exp_cb = exp_cb;
@@ -433,7 +440,7 @@ void
 GNUNET_HELPER_stop (struct GNUNET_HELPER_Handle *h)
 {
   struct GNUNET_HELPER_SendHandle *sh;
-
+  int c;
   h->exp_cb = NULL;
   /* signal pending writes that we were stopped */
   while (NULL != (sh = h->sh_head))
@@ -447,6 +454,10 @@ GNUNET_HELPER_stop (struct GNUNET_HELPER_Handle *h)
   }
   stop_helper (h);
   GNUNET_SERVER_mst_destroy (h->mst);
+  GNUNET_free ((char *) h->binary_name);
+  for (c = 0; h->binary_argv[c] != NULL; c++)
+    GNUNET_free (h->binary_argv[c]);
+  GNUNET_free (h->binary_argv);
   GNUNET_free (h);
 }