diff options
| author | robot-contrib <robot-contrib@yandex-team.com> | 2023-03-28 10:12:33 +0300 |
|---|---|---|
| committer | robot-contrib <robot-contrib@yandex-team.com> | 2023-03-28 10:12:33 +0300 |
| commit | 7a815bed611966b3e27f438f43bc9dc7f69aef70 (patch) | |
| tree | 0335bcf2d80c7d79a76496ffaa7bda87b6bbfdff /contrib/restricted/aws/s2n/stuffer | |
| parent | 14a9357e8d2d937e22b789d5aea09219a3e92c31 (diff) | |
| download | ydb-7a815bed611966b3e27f438f43bc9dc7f69aef70.tar.gz | |
Update contrib/restricted/aws/s2n to 1.3.39
Diffstat (limited to 'contrib/restricted/aws/s2n/stuffer')
| -rw-r--r-- | contrib/restricted/aws/s2n/stuffer/s2n_stuffer.c | 4 | ||||
| -rw-r--r-- | contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/restricted/aws/s2n/stuffer/s2n_stuffer.c b/contrib/restricted/aws/s2n/stuffer/s2n_stuffer.c index 92a47a3db4..e8d7c883b4 100644 --- a/contrib/restricted/aws/s2n/stuffer/s2n_stuffer.c +++ b/contrib/restricted/aws/s2n/stuffer/s2n_stuffer.c @@ -360,11 +360,11 @@ int s2n_stuffer_writev_bytes(struct s2n_stuffer *stuffer, const struct iovec *io continue; } size_t iov_len_op = iov[i].iov_len - to_skip; - POSIX_ENSURE(iov_len_op <= UINT32_MAX, S2N_FAILURE); + POSIX_ENSURE_LTE(iov_len_op, UINT32_MAX); uint32_t iov_len = (uint32_t) iov_len_op; uint32_t iov_size_to_take = MIN(size_left, iov_len); POSIX_ENSURE_REF(iov[i].iov_base); - POSIX_ENSURE(to_skip < iov[i].iov_len, S2N_FAILURE); + POSIX_ENSURE_LT(to_skip, iov[i].iov_len); POSIX_CHECKED_MEMCPY(ptr, ((uint8_t *) (iov[i].iov_base)) + to_skip, iov_size_to_take); size_left -= iov_size_to_take; if (size_left == 0) { diff --git a/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c b/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c index ac2453041e..a41564d54b 100644 --- a/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c +++ b/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c @@ -80,14 +80,14 @@ int s2n_stuffer_alloc_ro_from_fd(struct s2n_stuffer *stuffer, int rfd) POSIX_ENSURE(fstat(rfd, &st) >= 0, S2N_ERR_FSTAT); - POSIX_ENSURE(st.st_size > 0, S2N_FAILURE); - POSIX_ENSURE(st.st_size <= UINT32_MAX, S2N_FAILURE); + POSIX_ENSURE_GT(st.st_size, 0); + POSIX_ENSURE_LTE(st.st_size, UINT32_MAX); uint8_t *map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, rfd, 0); POSIX_ENSURE(map != MAP_FAILED, S2N_ERR_MMAP); struct s2n_blob b = { 0 }; - POSIX_ENSURE(s2n_blob_init(&b, map, (uint32_t) st.st_size), S2N_FAILURE); + POSIX_GUARD(s2n_blob_init(&b, map, (uint32_t) st.st_size)); return s2n_stuffer_init(stuffer, &b); } |