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

This commit was generated by cvs2svn to compensate for changes in r124488,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
Bill Fenner 2004-01-13 17:28:59 +00:00
commit cea4bb1622
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/tcpdump/print-isakmp.c
View File

@ -332,9 +332,13 @@ rawprint(caddr_t loc, size_t len)
static u_char *p; static u_char *p;
int i; int i;
TCHECK2(*loc, len);
p = (u_char *)loc; p = (u_char *)loc;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
printf("%02x", p[i] & 0xff); printf("%02x", p[i] & 0xff);
trunc:
} }
struct attrmap { struct attrmap {
@ -1060,6 +1064,8 @@ isakmp_sub_print(u_char np, struct isakmp_gen *ext, u_char *ep,
cp = (u_char *)ext; cp = (u_char *)ext;
while (np) { while (np) {
TCHECK2(*ext, sizeof(e));
safememcpy(&e, ext, sizeof(e)); safememcpy(&e, ext, sizeof(e));
if (ep < (u_char *)ext + ntohs(e.len)) { if (ep < (u_char *)ext + ntohs(e.len)) {
@ -1085,6 +1091,8 @@ isakmp_sub_print(u_char np, struct isakmp_gen *ext, u_char *ep,
ext = (struct isakmp_gen *)cp; ext = (struct isakmp_gen *)cp;
} }
return cp; return cp;
trunc:
return NULL;
} }
static char * static char *

2
contrib/tcpdump/print-radius.c
View File

@ -473,7 +473,7 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code )
break; break;
} }
for (i=0; i < length ; i++, data++) for (i=0; *data && i < length ; i++, data++)
printf("%c",(*data < 32 || *data > 128) ? '.' : *data ); printf("%c",(*data < 32 || *data > 128) ? '.' : *data );
printf("}"); printf("}");