From 1cc9762b6aede538b8fa4eb110878c9344bfa272 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Thu, 14 Apr 2022 14:41:45 +0200 Subject: [PATCH] host/ippair: fix integer warnings Ticket: 4516 --- src/host.c | 7 +++++-- src/ippair.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/host.c b/src/host.c index 8a067115d6..157a5a71fa 100644 --- a/src/host.c +++ b/src/host.c @@ -34,6 +34,7 @@ #include "util-random.h" #include "util-misc.h" #include "util-byte.h" +#include "util-validate.h" #include "host-queue.h" @@ -174,8 +175,10 @@ void HostClearMemory(Host *h) void HostInitConfig(bool quiet) { SCLogDebug("initializing host engine..."); - if (HostStorageSize() > 0) - g_host_size = sizeof(Host) + HostStorageSize(); + if (HostStorageSize() > 0) { + DEBUG_VALIDATE_BUG_ON(sizeof(Host) + HostStorageSize() > UINT16_MAX); + g_host_size = (uint16_t)(sizeof(Host) + HostStorageSize()); + } memset(&host_config, 0, sizeof(host_config)); //SC_ATOMIC_INIT(flow_flags); diff --git a/src/ippair.c b/src/ippair.c index fa307866b8..00c2b80eb3 100644 --- a/src/ippair.c +++ b/src/ippair.c @@ -33,6 +33,7 @@ #include "util-random.h" #include "util-misc.h" #include "util-byte.h" +#include "util-validate.h" #include "ippair-queue.h" @@ -168,8 +169,10 @@ void IPPairClearMemory(IPPair *h) void IPPairInitConfig(bool quiet) { SCLogDebug("initializing ippair engine..."); - if (IPPairStorageSize() > 0) - g_ippair_size = sizeof(IPPair) + IPPairStorageSize(); + if (IPPairStorageSize() > 0) { + DEBUG_VALIDATE_BUG_ON(sizeof(IPPair) + IPPairStorageSize() > UINT16_MAX); + g_ippair_size = (uint16_t)(sizeof(IPPair) + IPPairStorageSize()); + } memset(&ippair_config, 0, sizeof(ippair_config)); //SC_ATOMIC_INIT(flow_flags);