ctl: safety check for closing fd

taurus-forever · Jul 30, 2017 · 24c4f35 · 24c4f35
1 parent 649b789
commit 24c4f35
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c
@@ -376,7 +376,7 @@ static void mod_destroy(void)
 		switch(cs->transport){
 			case UNIXS_SOCK:
 			case UNIXD_SOCK:
-				close(cs->fd);
+				if(cs->fd>=0) close(cs->fd);
 				cs->fd=-1;
 				if (cs->write_fd!=-1){
 					close(cs->write_fd);

diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c
@@ -133,7 +133,6 @@ struct id_list* parse_listen_id(char* l, int len, enum socket_protos def)
 
 end:
 	/* fix all the stuff */
-	if (name==0) goto error;
 	if (proto==UNKNOWN_SOCK){
 		/* try to guess */
 		if (port_str){