odls: fix memory leak plug

This fixes commit e2c343c.

Author: ggouaillardet

orte/mca/odls/base/odls_base_default_fns.c

@@ -15,7 +15,7 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -642,6 +642,7 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
     int rc=ORTE_SUCCESS;
     orte_std_cntr_t proc_rank;
     char basedir[MAXPATHLEN];
+    char **argvsav=NULL;
     int inm, j, idx;
     int total_num_local_procs = 0;
     orte_odls_launch_local_t *caddy = (orte_odls_launch_local_t*)cbdata;
@@ -815,7 +816,6 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
 
         /* okay, now let's launch all the local procs for this app using the provided fork_local fn */
         for (proc_rank = 0, idx=0; idx < orte_local_children->size; idx++) {
-            char **argvsav=NULL;
             if (NULL == (child = (orte_proc_t*)opal_pointer_array_get_item(orte_local_children, idx))) {
                 continue;
             }
@@ -913,6 +913,9 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
                     }
                     /* don't have enough - wait a little time */
                     ORTE_DETECT_TIMEOUT(1000, 1000, -1, timer_cb, caddy);
+                    if (NULL != argvsav) {
+                        opal_argv_free(argvsav);
+                    }
                     return;
                 }
             }
@@ -1100,6 +1103,9 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
          */
         chdir(basedir);
     }
+    if (NULL != argvsav) {
+        opal_argv_free(argvsav);
+    }
 
  GETOUT:
     /* tell the state machine that all local procs for this job