ompi/runtime: plug a memory leak

declare ompi_mpi_show_mca_params_file as NULL
so MPI_T_Init_thread() can be invoked without leaking memory

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

ompi/runtime/ompi_mpi_params.c

@@ -17,6 +17,8 @@
  * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
  * Copyright (c) 2015      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -201,7 +203,6 @@ int ompi_mpi_register_params(void)
     }
 
     /* File to use when dumping the parameters */
-    ompi_mpi_show_mca_params_file = "";
     (void) mca_base_var_register("ompi", "mpi", NULL, "show_mca_params_file",
                                  "If mpi_show_mca_params is true, setting this string to a valid filename tells Open MPI to dump all the MCA parameter values into a file suitable for reading via the mca_param_files parameter (good for reproducability of MPI jobs)",
                                  MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
@@ -330,7 +331,8 @@ int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) {
     timestamp = time(NULL);
 
     /* Open the file if one is specified */
-    if (0 != strlen(ompi_mpi_show_mca_params_file)) {
+    if (NULL != ompi_mpi_show_mca_params_file &&
+        0 != strlen(ompi_mpi_show_mca_params_file)) {
         if ( NULL == (fp = fopen(ompi_mpi_show_mca_params_file, "w")) ) {
             opal_output(0, "Unable to open file <%s> to write MCA parameters", ompi_mpi_show_mca_params_file);
             return OMPI_ERR_FILE_OPEN_FAILURE;
@@ -389,7 +391,8 @@ int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) {
         }
 
         /* Print the parameter */
-        if (0 != strlen(ompi_mpi_show_mca_params_file)) {
+        if (NULL != ompi_mpi_show_mca_params_file &&
+            0 != strlen(ompi_mpi_show_mca_params_file)) {
             fprintf(fp, "%s\n", var_dump[0]);
         } else {
             opal_output(0, "%s\n", var_dump[0]);
@@ -399,7 +402,8 @@ int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) {
     }
 
     /* Close file, cleanup allocated memory*/
-    if (0 != strlen(ompi_mpi_show_mca_params_file)) {
+    if (NULL != ompi_mpi_show_mca_params_file &&
+        0 != strlen(ompi_mpi_show_mca_params_file)) {
         fclose(fp);
     }