From 4b87eb768711cc6ed892d0d7b5afa9874b9f5c7b Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 3 Nov 2019 14:55:48 -0800 Subject: fixes #1004 Warning found by clang --analyze It's possible for an empty chunk to have a NULL data pointer. Even when copying zero bytes, this makes clang somewhat unhappy. --- src/supplemental/websocket/websocket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/supplemental/websocket/websocket.c') diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index fe01c6e5..29d09c0e 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -846,12 +846,14 @@ ws_read_finish_str(nni_ws *ws) // This eats the entire iov. n = iov->iov_len; } - memcpy(iov->iov_buf, frame->buf, n); - iov->iov_buf = ((uint8_t *) iov->iov_buf) + n; - iov->iov_len -= n; - if (iov->iov_len == 0) { - iov++; - niov--; + if (n != 0) { + memcpy(iov->iov_buf, frame->buf, n); + iov->iov_buf = ((uint8_t *) iov->iov_buf) + n; + iov->iov_len -= n; + if (iov->iov_len == 0) { + iov++; + niov--; + } } if (frame->len == n) { -- cgit v1.2.3-70-g09d2