d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In sbin/dhclient, work around warnings about the size argument to

Browse Source 
strlcpy appearing to be the size of the source buffer, instead of the
destination.

MFC after:	1 week
This commit is contained in:
Dimitry Andric 2011-12-17 01:19:07 +00:00
parent 650fd1e4e4
commit e2f95dd941
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/dhclient/clparse.c
View File

@ -873,6 +873,7 @@ parse_string_list(FILE *cfile, struct string_list **lp, int multiple)
{
int token;
char *val;
size_t valsize;
struct string_list *cur, *tmp;
/* Find the last medium in the media list. */
@ -890,10 +891,11 @@ parse_string_list(FILE *cfile, struct string_list **lp, int multiple)
return;
}
tmp = new_string_list(strlen(val) + 1);
valsize = strlen(val) + 1;
tmp = new_string_list(valsize);
if (tmp == NULL)
error("no memory for string list entry.");
strlcpy(tmp->string, val, strlen(val) + 1);
strlcpy(tmp->string, val, valsize);
tmp->next = NULL;
/* Store this medium at the end of the media list. */

12
sbin/dhclient/parse.c
View File

@ -116,6 +116,7 @@ char *
parse_string(FILE *cfile)
{
char *val, *s;
size_t valsize;
int token;
token = next_token(&val, cfile);
@ -124,10 +125,11 @@ parse_string(FILE *cfile)
skip_to_semi(cfile);
return (NULL);
}
s = malloc(strlen(val) + 1);
valsize = strlen(val) + 1;
s = malloc(valsize);
if (!s)
error("no memory for string %s.", val);
strlcpy(s, val, strlen(val) + 1);
strlcpy(s, val, valsize);
if (!parse_semi(cfile))
return (NULL);
@ -242,6 +244,7 @@ parse_numeric_aggregate(FILE *cfile, unsigned char *buf, int *max,
unsigned char *bufp = buf, *s = NULL;
int token, count = 0;
char *val, *t;
size_t valsize;
pair c = NULL;
if (!bufp && *max) {
@ -288,10 +291,11 @@ parse_numeric_aggregate(FILE *cfile, unsigned char *buf, int *max,
convert_num(s, val, base, size);
s += size / 8;
} else {
t = malloc(strlen(val) + 1);
valsize = strlen(val) + 1;
t = malloc(valsize);
if (!t)
error("no temp space for number.");
strlcpy(t, val, strlen(val) + 1);
strlcpy(t, val, valsize);
c = cons(t, c);
}
} while (++count != *max);