Merge pull request #141 from AkihiroSuda/libslirp-20190829-03

[release/0.3] vendor libslirp@d203c81bc6c861e1671122c3194c21d1a6763641

Author: AkihiroSuda

vendor.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
-# Aug 2, 2019
-LIBSLIRP_COMMIT=76462e2f16c6fce6856fb914cbef6207d0be4bc5
+# Aug 26, 2019
+LIBSLIRP_COMMIT=d203c81bc6c861e1671122c3194c21d1a6763641
 LIBSLIRP_REPO=https://gitlab.freedesktop.org/slirp/libslirp.git
 
 # Jul 12, 2019

vendor/README.md

@@ -1,7 +1,7 @@
 # DO NOT EDIT MANUALLY
 
 Vendored components:
-* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`76462e2f16c6fce6856fb914cbef6207d0be4bc5`)
+* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`d203c81bc6c861e1671122c3194c21d1a6763641`)
 * parson: https://github.com/kgabis/parson.git (`c5bb9557fe98367aa8e041c65863909f12ee76b2`)
 
 Please do not edit the contents under this directory manually.

vendor/libslirp/src/ip_input.c

@@ -292,16 +292,18 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
      */
     while (q != (struct ipasfrag *)&fp->frag_link &&
            ip->ip_off + ip->ip_len > q->ipf_off) {
+        struct ipasfrag *prev;
         i = (ip->ip_off + ip->ip_len) - q->ipf_off;
         if (i < q->ipf_len) {
             q->ipf_len -= i;
             q->ipf_off += i;
             m_adj(dtom(slirp, q), i);
             break;
         }
+        prev = q;
         q = q->ipf_next;
-        m_free(dtom(slirp, q->ipf_prev));
-        ip_deq(q->ipf_prev);
+        ip_deq(prev);
+        m_free(dtom(slirp, prev));
     }
 
 insert: