ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-04-25 08:34:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ports and addresses must be malloced to avoid segfault on exit

Browse Source
This commit is contained in:
Matt Johnston 2015-12-02 22:37:20 +08:00
parent f64a50f319
commit e81b6fbc6e
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runopts.h
View File

@ -72,7 +72,8 @@ typedef struct svr_runopts {
int forkbg;
int usingsyslog;
/* ports is an array of the portcount listening ports */
/* ports and addresses are arrays of the portcount
listening ports. strings are malloced. */
char *ports[DROPBEAR_MAX_PORTS];
unsigned int portcount;
char *addresses[DROPBEAR_MAX_PORTS];

42
svr-runopts.c
View File

@ -33,7 +33,7 @@
svr_runopts svr_opts; /* GLOBAL */
static void printhelp(const char * progname);
static void addportandaddress(char* spec);
static void addportandaddress(const char* spec);
static void loadhostkey(const char *keyfile, int fatal_duplicate);
static void addhostkey(const char *keyfile);
@ -348,54 +348,56 @@ void svr_getopts(int argc, char ** argv) {
}
}
static void addportandaddress(char* spec) {
char *myspec = NULL;
static void addportandaddress(const char* spec) {
char *spec_copy = NULL, *myspec = NULL, *port = NULL, *address = NULL;
if (svr_opts.portcount < DROPBEAR_MAX_PORTS) {
/* We don't free it, it becomes part of the runopt state */
myspec = m_strdup(spec);
spec_copy = m_strdup(spec);
myspec = spec_copy;
if (myspec[0] == '[') {
myspec++;
svr_opts.ports[svr_opts.portcount] = strchr(myspec, ']');
if (svr_opts.ports[svr_opts.portcount] == NULL) {
port = strchr(myspec, ']');
if (!port) {
/* Unmatched [ -> exit */
dropbear_exit("Bad listen address");
}
svr_opts.ports[svr_opts.portcount][0] = '\0';
svr_opts.ports[svr_opts.portcount]++;
if (svr_opts.ports[svr_opts.portcount][0] != ':') {
port[0] = '\0';
port++;
if (port[0] != ':') {
/* Missing port -> exit */
dropbear_exit("Missing port");
}
} else {
/* search for ':', that separates address and port */
svr_opts.ports[svr_opts.portcount] = strrchr(myspec, ':');
port = strrchr(myspec, ':');
}
if (svr_opts.ports[svr_opts.portcount] == NULL) {
if (!port) {
/* no ':' -> the whole string specifies just a port */
svr_opts.ports[svr_opts.portcount] = myspec;
port = myspec;
} else {
/* Split the address/port */
svr_opts.ports[svr_opts.portcount][0] = '\0';
svr_opts.ports[svr_opts.portcount]++;
svr_opts.addresses[svr_opts.portcount] = myspec;
port[0] = '\0';
port++;
address = myspec;
}
if (svr_opts.addresses[svr_opts.portcount] == NULL) {
if (!address) {
/* no address given -> fill in the default address */
svr_opts.addresses[svr_opts.portcount] = m_strdup(DROPBEAR_DEFADDRESS);
address = DROPBEAR_DEFADDRESS;
}
if (svr_opts.ports[svr_opts.portcount][0] == '\0') {
if (port[0] == '\0') {
/* empty port -> exit */
dropbear_exit("Bad port");
}
svr_opts.ports[svr_opts.portcount] = m_strdup(port);
svr_opts.addresses[svr_opts.portcount] = m_strdup(address);
svr_opts.portcount++;
m_free(spec_copy);
}
}