diff options
| -rw-r--r-- | slirp/src/ip_input.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index a714fecd58..68a99de5b5 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -331,6 +331,8 @@ insert: q = fp->frag_link.next; m = dtom(slirp, q); + int was_ext = m->m_flags & M_EXT; + q = (struct ipasfrag *) q->ipf_next; while (q != (struct ipasfrag*)&fp->frag_link) { struct mbuf *t = dtom(slirp, q); @@ -347,13 +349,12 @@ insert: q = fp->frag_link.next; /* - * If the fragments concatenated to an mbuf that's - * bigger than the total size of the fragment, then and - * m_ext buffer was alloced. But fp->ipq_next points to - * the old buffer (in the mbuf), so we must point ip - * into the new buffer. + * If the fragments concatenated to an mbuf that's bigger than the total + * size of the fragment and the mbuf was not already using an m_ext buffer, + * then an m_ext buffer was alloced. But fp->ipq_next points to the old + * buffer (in the mbuf), so we must point ip into the new buffer. */ - if (m->m_flags & M_EXT) { + if (!was_ext && m->m_flags & M_EXT) { int delta = (char *)q - m->m_dat; q = (struct ipasfrag *)(m->m_ext + delta); } |