aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-06-20 20:25:03 +0200
committerSverker Eriksson <[email protected]>2016-06-20 20:25:03 +0200
commit3f64be5c822e1ee4d1dc2a4289e4906d789c64ac (patch)
tree8d7f71e6a482de7a28ace8b9101ce509b618c7cc
parentf91576820fd84c08fd2d3c9675b7801738740d4a (diff)
parent9f779819f6bda734c5953468f77987b73943de35 (diff)
downloadotp-3f64be5c822e1ee4d1dc2a4289e4906d789c64ac.tar.gz
otp-3f64be5c822e1ee4d1dc2a4289e4906d789c64ac.tar.bz2
otp-3f64be5c822e1ee4d1dc2a4289e4906d789c64ac.zip
Merge branch 'sverker/spawn-driver-env'
-rw-r--r--erts/emulator/sys/unix/sys_drivers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c
index ac39b8a389..812112fb91 100644
--- a/erts/emulator/sys/unix/sys_drivers.c
+++ b/erts/emulator/sys/unix/sys_drivers.c
@@ -762,7 +762,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
}
}
- if (res < buffsz) {
+ if (res < (buffsz + sizeof(buffsz))) {
/* we only wrote part of the command payload. Enqueue the rest. */
for (i = 0; i < iov_len; i++) {
driver_enq(port_num, io_vector[i].iov_base, io_vector[i].iov_len);