From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 Oct 2022 09:43:16 +0000 (+0200)
Subject: Fix 32-bit Windows issues related to QUIC_STREAM
X-Git-Tag: openssl-3.2.0-alpha1~1837
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44bc72a0f2edc343a7b46de8c1b1fc829fef90f7;p=thirdparty%2Fopenssl.git

Fix 32-bit Windows issues related to QUIC_STREAM

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19345)
---

diff --git a/ssl/quic/quic_stream.c b/ssl/quic/quic_stream.c
index 7e7d5417a47..56d80cb5681 100644
--- a/ssl/quic/quic_stream.c
+++ b/ssl/quic/quic_stream.c
@@ -54,7 +54,7 @@ static void ring_buf_destroy(struct ring_buf *r)
 
 static size_t ring_buf_used(struct ring_buf *r)
 {
-    return r->head_offset - r->ctail_offset;
+    return (size_t)(r->head_offset - r->ctail_offset);
 }
 
 static size_t ring_buf_avail(struct ring_buf *r)
@@ -122,7 +122,7 @@ static int ring_buf_get_buf_at(const struct ring_buf *r,
     }
 
     idx = logical_offset % r->alloc;
-    l   = r->head_offset - logical_offset;
+    l   = (size_t)(r->head_offset - logical_offset);
     if (l > r->alloc - idx)
         l = r->alloc - idx;
 
@@ -315,7 +315,7 @@ int ossl_quic_sstream_get_stream_frame(QUIC_SSTREAM *qss,
         assert(i < 2);
 
         if (total_len + src_len > max_len)
-            src_len = max_len - total_len;
+            src_len = (size_t)(max_len - total_len);
 
         iov[num_iov_].buf       = src;
         iov[num_iov_].buf_len   = src_len;