diff options
| author | Raimo Niskanen <[email protected]> | 2013-11-25 14:27:40 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2013-11-25 14:35:21 +0100 |
| commit | c4592b6941cf66cd89fb8f9664e021151dc11b8d (patch) | |
| tree | 9b251bc01e00fa49279d3c3f33cb4cd83e759cd1 /erts/emulator/beam | |
| parent | 01529a8de0f17acb29dfe5beaa6ad62587ed8e18 (diff) | |
| parent | b9278a19e1abdb80d93833773f4b9c431958bdcb (diff) | |
| download | otp-c4592b6941cf66cd89fb8f9664e021151dc11b8d.tar.gz otp-c4592b6941cf66cd89fb8f9664e021151dc11b8d.tar.bz2 otp-c4592b6941cf66cd89fb8f9664e021151dc11b8d.zip | |
Merge branch 'raimo/sctp-peernames/OTP-10229' into maint-r16
* raimo/sctp-peernames/OTP-10229:
Improve documentation
Suppress false valgrind warnings caused by sctp_getpaddrs
Document
Adjust test cases for SLES 10 SP 1
Clean up address family handling towards Erlang
Fix testcase indentation
Fix testcases for FreeBSD 9.1
Write testcases for inet:socknames and inet:peernames
Implement inet:socknames/1,2 and inet:peernames/1,2
Implement prim_inet:socknames/1,2 and prim_inet:peernames/1,2
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index c1e66b59af..aeecea1ff5 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -4078,7 +4078,7 @@ erts_port_control(Process* c_p, copy = 1; else { binp = ((ProcBin *) ebinp)->val; - ASSERT(bufp < bufp + size); + ASSERT(bufp <= bufp + size); ASSERT(binp->orig_bytes <= bufp && bufp + size <= binp->orig_bytes + binp->orig_size); erts_refc_inc(&binp->refc, 1); |