bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-01-22 19:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed return value of nestlex()

Browse source
This commit is contained in:
Gerhard Rieger 2015-04-01 14:22:01 +02:00
parent ad9e6b1fa4
commit 10011461ec
2 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -166,6 +166,8 @@ corrections:
Test: ABSTRACT_BIND Test: ABSTRACT_BIND
Thanks to Denis Shatov for reporting this bug. Thanks to Denis Shatov for reporting this bug.
Fixed return value of nestlex()
porting: porting:
Red Hat issue 1020203: configure checks fail with some compilers. Red Hat issue 1020203: configure checks fail with some compilers.
Use case: clang Use case: clang

63
xioopts.c
View file

@ -1798,7 +1798,11 @@ int parseopts_table(const char **a, struct opt **opts,
parsres = parsres =
nestlex(a, &tokp, &len, endkey, hquotes, squotes, nests, nestlex(a, &tokp, &len, endkey, hquotes, squotes, nests,
true, true, true, false); true, true, true, false);
if (parsres != 0) { if (parsres < 0) {
Error1("option too long: \"%s\"", *a);
return -1;
} else if (parsres > 0) {
Error1("syntax error in \"%s\"", *a);
return -1; return -1;
} }
if (tokp == token) { if (tokp == token) {
@ -1835,7 +1839,11 @@ int parseopts_table(const char **a, struct opt **opts,
parsres = parsres =
nestlex(a, &tokp, &len, endval, hquotes, squotes, nests, nestlex(a, &tokp, &len, endval, hquotes, squotes, nests,
true, true, true, false); true, true, true, false);
if (parsres != 0) { if (parsres < 0) {
Error1("option too long: \"%s\"", *a);
return -1;
} else if (parsres > 0) {
Error1("syntax error in \"%s\"", *a);
return -1; return -1;
} }
*tokp = '\0'; *tokp = '\0';
@ -2309,10 +2317,17 @@ int parseopts_table(const char **a, struct opt **opts,
/* parse first IP address, expect ':' */ /* parse first IP address, expect ':' */
tokp = token; tokp = token;
/*! result= */ parsres =
nestlex((const char **)&tokp, &buffp, &bufspc, nestlex((const char **)&tokp, &buffp, &bufspc,
ends, NULL, NULL, nests, ends, NULL, NULL, nests,
true, true, false, false); true, true, false, false);
if (parsres < 0) {
Error1("option too long: \"%s\"", *a);
return -1;
} else if (parsres > 0) {
Error1("syntax error in \"%s\"", *a);
return -1;
}
if (*tokp != ':') { if (*tokp != ':') {
Error1("syntax in option %s: missing ':'", token); Error1("syntax in option %s: missing ':'", token);
} }
@ -2322,10 +2337,17 @@ int parseopts_table(const char **a, struct opt **opts,
++tokp; ++tokp;
/* parse second IP address, expect ':' or '\0'' */ /* parse second IP address, expect ':' or '\0'' */
buffp = buff; buffp = buff;
/*! result= */ parsres =
nestlex((const char **)&tokp, &buffp, &bufspc, nestlex((const char **)&tokp, &buffp, &bufspc,
ends, NULL, NULL, nests, ends, NULL, NULL, nests,
true, true, false, false); true, true, false, false);
if (parsres < 0) {
Error1("option too long: \"%s\"", *a);
return -1;
} else if (parsres > 0) {
Error1("syntax error in \"%s\"", *a);
return -1;
}
*buffp++ = '\0'; *buffp++ = '\0';
(*opts)[i].value.u_ip_mreq.param2 = strdup(buff); /*!!! NULL */ (*opts)[i].value.u_ip_mreq.param2 = strdup(buff); /*!!! NULL */
@ -2363,9 +2385,17 @@ int parseopts_table(const char **a, struct opt **opts,
char buff[512], *buffp=buff; size_t bufspc = sizeof(buff)-1; char buff[512], *buffp=buff; size_t bufspc = sizeof(buff)-1;
tokp = token; tokp = token;
parsres =
nestlex((const char **)&tokp, &buffp, &bufspc, nestlex((const char **)&tokp, &buffp, &bufspc,
ends, NULL, NULL, nests, ends, NULL, NULL, nests,
true, true, false, false); true, true, false, false);
if (parsres < 0) {
Error1("option too long: \"%s\"", *a);
return -1;
} else if (parsres > 0) {
Error1("syntax error in \"%s\"", *a);
return -1;
}
if (*tokp != '\0') { if (*tokp != '\0') {
Error1("trailing data in option \"%s\"", token); Error1("trailing data in option \"%s\"", token);
} }
@ -2833,6 +2863,7 @@ int retropt_bind(struct opt *opts,
char *bindname, *bindp; char *bindname, *bindp;
char hostname[512], *hostp = hostname, *portp = NULL; char hostname[512], *hostp = hostname, *portp = NULL;
size_t hostlen = sizeof(hostname)-1; size_t hostlen = sizeof(hostname)-1;
int parsres;
int result; int result;
if (retropt_string(opts, OPT_BIND, &bindname) < 0) { if (retropt_string(opts, OPT_BIND, &bindname) < 0) {
@ -2866,8 +2897,16 @@ int retropt_bind(struct opt *opts,
case AF_INET6: case AF_INET6:
#endif /*WITH_IP6 */ #endif /*WITH_IP6 */
portallowed = (feats>=2); portallowed = (feats>=2);
nestlex((const char **)&bindp, &hostp, &hostlen, ends, NULL, NULL, nests, parsres =
true, false, false, false); nestlex((const char **)&bindp, &hostp, &hostlen, ends, NULL, NULL, nests,
true, false, false, false);
if (parsres < 0) {
Error1("option too long: \"%s\"", bindp);
return STAT_NORETRY;
} else if (parsres > 0) {
Error1("syntax error in \"%s\"", bindp);
return STAT_NORETRY;
}
*hostp++ = '\0'; *hostp++ = '\0';
if (!strncmp(bindp, portsep, strlen(portsep))) { if (!strncmp(bindp, portsep, strlen(portsep))) {
if (!portallowed) { if (!portallowed) {