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

Add a missing memcpy (*blush*!)

Browse Source 
Suggested by: James P Scully <scully@CS.Arizona.EDU>, Perianayagam Somasundaram <somu@CS.Arizona.EDU>
MFC after:	10 days
This commit is contained in:
Brian Somers 2004-04-17 00:29:17 +00:00
parent c61314601b
commit 76a194bf74
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/ppp/mbuf.c
View File

@ -248,11 +248,13 @@ m_prepend(struct mbuf *bp, const void *ptr, size_t len, size_t extra)
if (bp->m_offset >= len) { if (bp->m_offset >= len) {
bp->m_offset -= len; bp->m_offset -= len;
bp->m_len += len; bp->m_len += len;
memcpy(MBUF_CTOP(bp), ptr, len); if (ptr)
memcpy(MBUF_CTOP(bp), ptr, len);
return bp; return bp;
} }
len -= bp->m_offset; len -= bp->m_offset;
memcpy(bp + 1, (const char *)ptr + len, bp->m_offset); if (ptr)
memcpy(bp + 1, (const char *)ptr + len, bp->m_offset);
bp->m_len += bp->m_offset; bp->m_len += bp->m_offset;
bp->m_offset = 0; bp->m_offset = 0;
} }
@ -425,9 +427,11 @@ m_append(struct mbuf *bp, const void *v, size_t sz)
if (m) { if (m) {
while (m->m_next) while (m->m_next)
m = m->m_next; m = m->m_next;
if (m->m_size - m->m_len > sz) if (m->m_size - m->m_len >= sz) {
if (v)
memcpy((char *)(m + 1) + m->m_len, v, sz);
m->m_len += sz; m->m_len += sz;
else } else
m->m_next = m_prepend(NULL, v, sz, 0); m->m_next = m_prepend(NULL, v, sz, 0);
} else } else
bp = m_prepend(NULL, v, sz, 0); bp = m_prepend(NULL, v, sz, 0);