3 files changed, 11 insertions, 3 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 08576d923f..2267f9b12b 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -324,7 +324,11 @@ static void run_daemon(EpmdVars *g)
       }
 
     /* move cwd to root to make sure we are not on a mounted filesystem  */
-    chdir("/");
+    if (chdir("/") < 0)
+      {
+	dbg_perror(g,"epmd: chdir() failed");
+	epmd_cleanup_exit(g,1);
+      }
     
     umask(0);
 
diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c
index ac55ba6bb6..2377c0dfe7 100644
--- a/erts/epmd/src/epmd_cli.c
+++ b/erts/epmd/src/epmd_cli.c
@@ -104,7 +104,10 @@ void epmd_call(EpmdVars *g,int what)
     fd = conn_to_epmd(g);
     put_int16(1,buf);
     buf[2] = what;
-    write(fd,buf,3);
+    if (write(fd, buf, 3) != 3) {
+	printf("epmd: Can't write to epmd\n");
+	epmd_cleanup_exit(g,1);
+    }
     if (read(fd,(char *)&i,4) != 4) {
 	if (!g->silent)
 	    printf("epmd: no response from local epmd\n");
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 5debae26b6..da575affa1 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -102,7 +102,8 @@ void run(EpmdVars *g)
 
   dbg_printf(g,2,"try to initiate listening port %d", g->port);
 
-  if (g->addresses != NULL)
+  if (g->addresses != NULL && /* String contains non-separator characters if: */
+      g->addresses[strspn(g->addresses," ,")] != '\000')
     {
       char *tmp;
       char *token;