diff options
| author | Lukas Larsson <[email protected]> | 2013-08-21 15:25:41 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-08-21 15:25:41 +0200 |
| commit | d084deb8176ebad6fb2c7758fab4083d49e2b6fe (patch) | |
| tree | 9b98ae98f147d61980193ae805ee29a2ff55cf68 | |
| parent | b80f30417fce361ebb19a13a471090165b7ad1c8 (diff) | |
| parent | 58b4fdbe984759e1d679a4c194fe9ac26616357b (diff) | |
| download | otp-d084deb8176ebad6fb2c7758fab4083d49e2b6fe.tar.gz otp-d084deb8176ebad6fb2c7758fab4083d49e2b6fe.tar.bz2 otp-d084deb8176ebad6fb2c7758fab4083d49e2b6fe.zip | |
Merge branch 'maint'
* maint:
erts: Fix bug in translating ev macros to functions
Prepare release
PER, UPER: Fix encoding/decoding of open types greater than 16K
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index edcb56de1d..9e95325c24 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -553,8 +553,10 @@ efile_ev_get_char(ErlIOVec *ev, char *p, int *pp, int *qp) { *(p) = *EV_CHAR_P(ev, *(pp), *(qp)); if (*(pp)+1 < (ev)->iov[*(qp)].iov_len) *(pp) = *(pp)+1; - else + else { (*(qp))++; + *pp = 0; + } return !0; } return 0; @@ -575,8 +577,10 @@ efile_ev_get_uint32(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) { | (EV_UINT32(ev, *(pp)+3, *(qp))); if (*(pp)+4 < (ev)->iov[*(qp)].iov_len) *(pp) = *(pp)+4; - else + else { (*(qp))++; + *pp = 0; + } return !0; } return 0; @@ -601,8 +605,10 @@ efile_ev_get_uint64(ErlIOVec *ev, Uint64 *p, int *pp, int *qp) { | (EV_UINT64(ev, *(pp)+7, *(qp))); if (*(pp)+8 < (ev)->iov[*(qp)].iov_len) *(pp) = *(pp)+8; - else + else { (*(qp))++; + *pp = 0; + } return !0; } return 0; |