From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 19 Sep 2023 09:03:55 +0000 (+0200)
Subject: decode: fix -Wshorten-64-to-32 warnings
X-Git-Tag: suricata-8.0.0-beta1~1032
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090079cdd8d5c21d76a4fbc6ec3da90df67428b2;p=thirdparty%2Fsuricata.git

decode: fix -Wshorten-64-to-32 warnings

Ticket: #6186
---

diff --git a/src/decode-teredo.c b/src/decode-teredo.c
index bbeda3efa3..9fd46f0118 100644
--- a/src/decode-teredo.c
+++ b/src/decode-teredo.c
@@ -182,7 +182,7 @@ int DecodeTeredo(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
 
         if (len ==  IPV6_HEADER_LEN +
                 IPV6_GET_RAW_PLEN(thdr) + (start - pkt)) {
-            int blen = len - (start - pkt);
+            uint32_t blen = len - (uint32_t)(start - pkt);
             /* spawn off tunnel packet */
             Packet *tp = PacketTunnelPktSetup(tv, dtv, p, start, blen,
                     DECODE_TUNNEL_IPV6_TEREDO);
diff --git a/src/decode.c b/src/decode.c
index 4523442052..927791b08b 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -350,7 +350,7 @@ inline int PacketCopyDataOffset(Packet *p, uint32_t offset, const uint8_t *data,
  */
 inline int PacketCopyData(Packet *p, const uint8_t *pktdata, uint32_t pktlen)
 {
-    SET_PKT_LEN(p, (size_t)pktlen);
+    SET_PKT_LEN(p, pktlen);
     return PacketCopyDataOffset(p, 0, pktdata, pktlen);
 }
 
@@ -810,7 +810,7 @@ void DecodeThreadVarsFree(ThreadVars *tv, DecodeThreadVars *dtv)
  */
 inline int PacketSetData(Packet *p, const uint8_t *pktdata, uint32_t pktlen)
 {
-    SET_PKT_LEN(p, (size_t)pktlen);
+    SET_PKT_LEN(p, pktlen);
     if (unlikely(!pktdata)) {
         return -1;
     }