35c35
< * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $
---
> * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#63 $
3179c3179
< * path 104 bytes
---
> * path (up to) 104 bytes + NULL (NULL terminated string).
3184a3185,3186
> u_char *p;
> int slen;
3185a3188
>
3190,3191c3193,3197
< READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, 104, tok->len,
< err);
---
> /* slen = strnlen((buf + tok->len), 104) + 1; */
> p = (u_char *)memchr((const void *)(buf + tok->len), '\0', 104);
> slen = (p ? (int)(p - (buf + tok->len)) : 104) + 1;
>
> READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, slen, tok->len, err);
< * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $
---
> * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#63 $
3179c3179
< * path 104 bytes
---
> * path (up to) 104 bytes + NULL (NULL terminated string).
3184a3185,3186
> u_char *p;
> int slen;
3185a3188
>
3190,3191c3193,3197
< READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, 104, tok->len,
< err);
---
> /* slen = strnlen((buf + tok->len), 104) + 1; */
> p = (u_char *)memchr((const void *)(buf + tok->len), '\0', 104);
> slen = (p ? (int)(p - (buf + tok->len)) : 104) + 1;
>
> READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, slen, tok->len, err);