bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-11 06:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Socat address parser read over end of string when there was unbalanced quoting

Browse source
This commit is contained in:
Gerhard Rieger 2020-10-13 19:25:21 +02:00
parent 8e6b341f59
commit b62ff0c005
4 changed files with 43 additions and 1 deletions

7
xioopen.c
View file

@ -367,6 +367,8 @@ xiofile_t *xioopen(const char *addr, /* address specification */
return NULL;
}
Debug1("xioopen(\"%s\")", addr);
if ((xfd = xioparse_dual(&addr)) == NULL) {
return NULL;
}
@ -384,6 +386,8 @@ xiofile_t *xioopen(const char *addr, /* address specification */
return xfd;
}
/* parse an address string that might contain !!
return NULL on error */
static xiofile_t *xioparse_dual(const char **addr) {
xiofile_t *xfd;
xiosingle_t *sfd1;
@ -445,6 +449,7 @@ static int xioopen_dual(xiofile_t *xfd, int xioflags) {
static xiosingle_t *xioparse_single(const char **addr) {
const char *addr0 = *addr; /* save for error messages */
xiofile_t *xfd;
xiosingle_t *sfd;
struct addrname *ae;
@ -540,7 +545,7 @@ static xiosingle_t *xioparse_single(const char **addr) {
len = sizeof(token); tokp = token;
if (nestlex(addr, &tokp, &len, ends, hquotes, squotes, nests,
true, true, false) != 0) {
Error2("syntax error in address \"%s%s\"", token, *addr);
Error1("syntax error in address \"%s\"", addr0);
}
*tokp = '\0';
if ((sfd->argv[sfd->argc++] = strdup(token)) == NULL) {