diff options
| author | Michael Adam <obnox@samba.org> | 2014-09-29 11:39:24 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-09-30 16:36:10 +0200 |
| commit | e38f4f4ceb5b2605dd0804ab7629f9b5e8d5cd5c (patch) | |
| tree | e8dc1acd5e620c1ab7ba6968eb01624404327b67 | |
| parent | 2564a5fa578058953c9c2890566b4fdd51a744be (diff) | |
| download | samba-e38f4f4ceb5b2605dd0804ab7629f9b5e8d5cd5c.tar.gz | |
s3:unix_msg: rename a variable buflen->data_len in queue_msg()
Pair-Programmed-With: Volker Lendecke <vl@samba.org>
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/lib/unix_msg/unix_msg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c index e38bec160f9..dca2ab151b9 100644 --- a/source3/lib/unix_msg/unix_msg.c +++ b/source3/lib/unix_msg/unix_msg.c @@ -449,7 +449,7 @@ static int queue_msg(struct unix_dgram_send_queue *q, const int *fds, size_t num_fds) { struct unix_dgram_msg *msg; - ssize_t buflen; + ssize_t data_len; uint8_t *data_buf; size_t msglen; size_t fds_size = sizeof(int) * num_fds; @@ -475,14 +475,14 @@ static int queue_msg(struct unix_dgram_send_queue *q, } } - buflen = iov_buflen(iov, iovlen); - if (buflen == -1) { + data_len = iov_buflen(iov, iovlen); + if (data_len == -1) { goto invalid; } msglen = offsetof(struct unix_dgram_msg, buf); - tmp = msglen + buflen; - if ((tmp < msglen) || (tmp < buflen)) { + tmp = msglen + data_len; + if ((tmp < msglen) || (tmp < data_len)) { /* overflow */ goto invalid; } @@ -514,7 +514,7 @@ static int queue_msg(struct unix_dgram_send_queue *q, ret = ENOMEM; goto fail; } - msg->buflen = buflen; + msg->buflen = data_len; msg->sock = q->sock; data_buf = msg->buf; |