Skip to content

Commit fc63e79

Browse files
committed
vendor libslirp@d203c81bc6c861e1671122c3194c21d1a6763641
https://gitlab.freedesktop.org/slirp/libslirp/compare/76462e2f16c6fce6856fb914cbef6207d0be4bc5...d203c81bc6c861e1671122c3194c21d1a6763641 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
1 parent 29db6bd commit fc63e79

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

vendor.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -eux -o pipefail
3-
# Aug 2, 2019
4-
LIBSLIRP_COMMIT=76462e2f16c6fce6856fb914cbef6207d0be4bc5
3+
# Aug 26, 2019
4+
LIBSLIRP_COMMIT=d203c81bc6c861e1671122c3194c21d1a6763641
55
LIBSLIRP_REPO=https://gitlab.freedesktop.org/slirp/libslirp.git
66

77
# Jul 12, 2019

vendor/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT MANUALLY
22

33
Vendored components:
4-
* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`76462e2f16c6fce6856fb914cbef6207d0be4bc5`)
4+
* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`d203c81bc6c861e1671122c3194c21d1a6763641`)
55
* parson: https://github.com/kgabis/parson.git (`c5bb9557fe98367aa8e041c65863909f12ee76b2`)
66

77
Please do not edit the contents under this directory manually.

vendor/libslirp/src/ip_input.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,18 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
292292
*/
293293
while (q != (struct ipasfrag *)&fp->frag_link &&
294294
ip->ip_off + ip->ip_len > q->ipf_off) {
295+
struct ipasfrag *prev;
295296
i = (ip->ip_off + ip->ip_len) - q->ipf_off;
296297
if (i < q->ipf_len) {
297298
q->ipf_len -= i;
298299
q->ipf_off += i;
299300
m_adj(dtom(slirp, q), i);
300301
break;
301302
}
303+
prev = q;
302304
q = q->ipf_next;
303-
m_free(dtom(slirp, q->ipf_prev));
304-
ip_deq(q->ipf_prev);
305+
ip_deq(prev);
306+
m_free(dtom(slirp, prev));
305307
}
306308

307309
insert:

0 commit comments

Comments
 (0)