From 1cea75dd51661a3406ff336f229edee6f782399b Mon Sep 17 00:00:00 2001
From: Masamichi Takagi <masamichi.takagi@riken.jp>
Date: Fri, 29 Jan 2021 10:51:25 +0900
Subject: [PATCH] mcexec: fix strncat missing NULL and pclose of uninitialized

Change-Id: I9ce4004580845a983949caa5668b2f950880cd24
---
 executer/user/mcexec.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c
index c48e2450..338d0039 100644
--- a/executer/user/mcexec.c
+++ b/executer/user/mcexec.c
@@ -1957,14 +1957,14 @@ opendev()
 			fprintf(stderr, "%s: warning: LD_PRELOAD line is too long\n", __FUNCTION__); \
 			return; \
 		} \
-		strncat(envbuf, elembuf, remainder); \
+		strncat(envbuf, elembuf, remainder - 1); \
 		remainder = PATH_MAX - (strlen(envbuf) + 1); \
 		nelem++; \
 	} while (0)
 
 static ssize_t find_libdir(char *libdir, size_t len)
 {
-	FILE *filep;
+	FILE *filep = NULL;
 	ssize_t rc;
 	size_t linelen = 0;
 	char *line = NULL;
@@ -2020,7 +2020,9 @@ static ssize_t find_libdir(char *libdir, size_t len)
 	}
 
 out:
-	pclose(filep);
+	if (filep) {
+		pclose(filep);
+	}
 	free(line);
 	return rc;
 }