summaryrefslogtreecommitdiff
path: root/libc/inet
diff options
context:
space:
mode:
authorNatanael Copa <natanael.copa@gmail.com>2010-10-14 06:35:10 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-10-14 15:00:04 +0200
commit7b74c6bab0fc39325a5b9a978a3d8ab73009e5d3 (patch)
treef11b8f91f096f7d047cc89e3a4c695be17920a17 /libc/inet
parent3dc83600855e3754a9046495751758624ac5bfb7 (diff)
getproto: increase line buffer size, simlify and fix alias handling
We increase line buffer size, reduce MAXALIASES and make sure we don't segfault when there are too manuy aliases in /etc/protocols. Signed-off-by: Natanael Copa <natanael.copa@gmail.com> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/inet')
-rw-r--r--libc/inet/getproto.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index bcf507bda..c59da7e66 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -27,9 +27,11 @@ aliases: case sensitive optional space or tab separated list of other names
#include <bits/uClibc_mutex.h>
__UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
-#define MAXALIASES 35
-#define BUFSZ (80) /* one line */
-#define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXALIASES))
+#define MINTOKENS 2
+#define MAXALIASES 8 /* will probably never be more than one */
+#define MAXTOKENS (MINTOKENS + MAXALIASES + 1)
+#define BUFSZ (255) /* one line */
+#define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXTOKENS))
static parser_t *protop = NULL;
static struct protoent protoe;
@@ -63,10 +65,8 @@ libc_hidden_def(endprotoent)
int getprotoent_r(struct protoent *result_buf,
char *buf, size_t buflen, struct protoent **result)
{
- char **alias, *cp = NULL;
- char **proto_aliases;
char **tok = NULL;
- const size_t aliaslen = sizeof(*proto_aliases) * MAXALIASES;
+ const size_t aliaslen = sizeof(char *) * MAXTOKENS;
int ret = ERANGE;
*result = NULL;
@@ -85,21 +85,12 @@ int getprotoent_r(struct protoent *result_buf,
protop->data_len = aliaslen;
protop->line_len = buflen - aliaslen;
/* <name>[[:space:]]<protonumber>[[:space:]][<aliases>] */
- if (!config_read(protop, &tok, 3, 2, "# \t/", PARSE_NORMAL)) {
+ if (!config_read(protop, &tok, MAXTOKENS - 1, MINTOKENS, "# \t/", PARSE_NORMAL)) {
goto DONE;
}
result_buf->p_name = *(tok++);
result_buf->p_proto = atoi(*(tok++));
- result_buf->p_aliases = alias = proto_aliases = tok;
- cp = *alias;
- while (cp && *cp) {
- if (alias < &proto_aliases[MAXALIASES - 1])
- *alias++ = cp;
- cp = strpbrk(cp, " \t");
- if (cp != NULL)
- *cp++ = '\0';
- }
- *alias = NULL;
+ result_buf->p_aliases = tok;
*result = result_buf;
ret = 0;
DONE: