simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #372 from StefanAlexandruBogdan/master

Browse source 
free the sshPort to prevent memory leak and indent newly added code to preserve code styling
This commit is contained in:
Luka Krajger 2016-05-05 16:18:05 -04:00
commit e05c6d8178
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shellinabox/service.c
View file

@ -127,20 +127,21 @@ void initService(struct Service *service, const char *arg) {
if ((ptr = strchr(arg, ':')) != NULL) { if ((ptr = strchr(arg, ':')) != NULL) {
ptr = ptr + 1; ptr = ptr + 1;
if (*ptr) { if (*ptr) {
char * tmp = strchr(ptr, ':'); char * tmp = strchr(ptr, ':');
if(tmp == NULL)//if the second ":" is not found, keep as host whatever is after first ":" if(tmp == NULL)//if the second ":" is not found, keep as host whatever is after first ":"
{ {
free(host); free(host);
host = strdup(ptr); host = strdup(ptr);
} }
else // if we find a second ":", keep as a host whatever is in between first ":" and second ":" and as sshPort whatever is after second ":" else // if we find a second ":", keep as a host whatever is in between first ":" and second ":" and as sshPort whatever is after second ":"
{ {
int size = (tmp - ptr + 1); int size = (tmp - ptr + 1);
free(host); free(host);
host = malloc(size); free(sshPort);
host = malloc(size);
memset(host, 0, size); memset(host, 0, size);
memcpy(host, ptr , size-1); memcpy(host, ptr , size - 1);
sshPort = strdup (tmp + 1); sshPort = strdup (tmp + 1);
} }
} }
} }