From eb6b20a502f7c20b6a5cfc9155dcbf2cb06c895e Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 20 Oct 2016 20:51:04 -0700 Subject: A few volatile fixes related to setjmp. * socket.c (dgram_get_byte_callback): nbytes must be volatile because we assign to it after setting up the catch, and then access it in the unwind code. (sock_accept): Likewise. * stream.c (generic_get_line): buf variable must be volatile. (struct save_fds): The members of this structure must be volatile; it's used as a local variable in a number of functions in a way that requires volatile. --- socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'socket.c') diff --git a/socket.c b/socket.c index fe0c4a83..564db0ef 100644 --- a/socket.c +++ b/socket.c @@ -408,7 +408,7 @@ static int dgram_get_byte_callback(mem_t *ctx) } else { const int dgram_size = d->rx_max; mem_t *dgram = chk_malloc(dgram_size); - ssize_t nbytes = -1; + volatile ssize_t nbytes = -1; uw_simple_catch_begin; @@ -895,7 +895,7 @@ static val sock_accept(val sock, val mode_str, val timeout_in) if (type == num_fast(SOCK_DGRAM)) { struct dgram_stream *d = coerce(struct dgram_stream *, sock->co.handle); - ssize_t nbytes = -1; + volatile ssize_t nbytes = -1; const int dgram_size = d->rx_max; mem_t *dgram = chk_malloc(dgram_size); -- cgit v1.2.3