aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-01-27 11:41:27 +0100
committerLukas Larsson <[email protected]>2016-01-27 11:41:27 +0100
commitb5e787a6483c1aff35d44c0130946df441497d9d (patch)
tree2808062c048db3e3fa2d1c514bc6e0df8b120c8e
parent5ebe9f68a34716eeb3739762e39f9afb4a945932 (diff)
parentfe72df791e7857fa72f6ac2b7ba476212a0c2edd (diff)
downloadotp-b5e787a6483c1aff35d44c0130946df441497d9d.tar.gz
otp-b5e787a6483c1aff35d44c0130946df441497d9d.tar.bz2
otp-b5e787a6483c1aff35d44c0130946df441497d9d.zip
Merge branch 'mikpe/erts/efile-write-compressed-error/OTP-13270' into maint
* mikpe/erts/efile-write-compressed-error/OTP-13270: efile_drv: logic error in compressed file write
-rw-r--r--erts/emulator/drivers/common/efile_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 3b6abec25e..a5a5dfb7f8 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -1532,10 +1532,10 @@ static void invoke_writev(void *data) {
* with errno.
*/
errno = EINVAL;
- if (! (status =
- erts_gzwrite((ErtsGzFile)d->fd,
- iov[i].iov_base,
- iov[i].iov_len)) == iov[i].iov_len) {
+ status = erts_gzwrite((ErtsGzFile)d->fd,
+ iov[i].iov_base,
+ iov[i].iov_len) == iov[i].iov_len;
+ if (! status) {
d->errInfo.posix_errno =
d->errInfo.os_errno = errno; /* XXX Correct? */
break;