aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-07-18 15:02:36 +0200
committerSverker Eriksson <[email protected]>2018-07-18 15:02:36 +0200
commit866b073857f31a04561b96bf666cb9e6eacf0cfd (patch)
tree8bb16a8ed90938d5e73f321f50a1b2710695c582 /lib/erl_interface/src
parent79cfc7493996dea4a7eed5c84421b45212d80edf (diff)
parent6a98a4b05ae77739d27f2a9fb018786906e6918c (diff)
downloadotp-866b073857f31a04561b96bf666cb9e6eacf0cfd.tar.gz
otp-866b073857f31a04561b96bf666cb9e6eacf0cfd.tar.bz2
otp-866b073857f31a04561b96bf666cb9e6eacf0cfd.zip
Merge branch 'maint'
Diffstat (limited to 'lib/erl_interface/src')
-rw-r--r--lib/erl_interface/src/connect/ei_connect.c2
-rw-r--r--lib/erl_interface/src/misc/ei_pthreads.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 75b705a8fa..9df4fa3b6c 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1022,7 +1022,7 @@ int ei_do_receive_msg(int fd, int staticbuffer_p,
erl_errno = EMSGSIZE;
return ERL_ERROR;
}
- x->index = x->buffsz;
+ x->index = msglen;
switch (msg->msgtype) { /* FIXME does not handle trace tokens and monitors */
case ERL_SEND:
case ERL_REG_SEND:
diff --git a/lib/erl_interface/src/misc/ei_pthreads.c b/lib/erl_interface/src/misc/ei_pthreads.c
index 25608edeec..8b34364659 100644
--- a/lib/erl_interface/src/misc/ei_pthreads.c
+++ b/lib/erl_interface/src/misc/ei_pthreads.c
@@ -206,6 +206,7 @@ volatile int *__erl_errno_place(void)
use_fallback = 1;
return &fallback_errno;
}
+ *erl_errno_p = 0;
if (pthread_setspecific(erl_errno_key, erl_errno_p) != 0 ||
(erl_errno_p = pthread_getspecific(erl_errno_key)) == NULL) {