]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Fix NULL ptr access in _gnutls_iov_iter_next()
authorTim Rühsen <tim.ruehsen@gmx.de>
Sun, 22 Dec 2019 12:20:03 +0000 (13:20 +0100)
committerTim Rühsen <tim.ruehsen@gmx.de>
Fri, 3 Jan 2020 10:34:37 +0000 (11:34 +0100)
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
lib/iov.c

index 1cd8d46dd795680f172b929240726e2af5e59000..d148ac97e444c1b05e9a02c96846bdb2070de6b8 100644 (file)
--- a/lib/iov.c
+++ b/lib/iov.c
@@ -77,6 +77,12 @@ _gnutls_iov_iter_next(struct iov_iter_st *iter, uint8_t **data)
                size_t len = iov->iov_len;
                size_t block_left;
 
+               if (!p) {
+                       // skip NULL iov entries, else we run into issues below
+                       iter->iov_index++;
+                       continue;
+               }
+
                if (unlikely(len < iter->iov_offset))
                        return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET_LENGTH);
                len -= iter->iov_offset;