Fix some UBSAN issues:

*) common.c:2041:13: runtime error: left shift of 1 by 31 places cannot be represented in type 'long' *) inet_util.c:847:36: runtime error: left shift of negative value -1
gvanem · Jan 18, 2025 · 6df1d1c · 6df1d1c
1 parent 1306ae1
commit 6df1d1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/common.c b/src/common.c
@@ -2003,7 +2003,7 @@ int fnmatch (const char *pattern, const char *string, int flags)
  * "C Programmer's Guide to Serial Communications", by Joe Campbell.
  */
 #define CRC_BITS    32
-#define CRC_HIBIT   ((DWORD) (1L << (CRC_BITS-1)))
+#define CRC_HIBIT   ((DWORD) (1UL << (CRC_BITS-1)))
 #define CRC_SHIFTS  (CRC_BITS-8)
 
 /* Our PRZ's 24-bit CRC generator polynomial. Ref:

diff --git a/src/inet_util.c b/src/inet_util.c
@@ -843,7 +843,7 @@ int INET_util_network_len128 (const struct in6_addr *a, const struct in6_addr *b
  */
 void INET_util_get_mask4 (struct in_addr *out, int bits)
 {
-  *(DWORD*)out = bits ? swap32 (~0 << (32 - bits)) : 0;
+  *(DWORD*)out = bits ? swap32 (~0UL << (DWORD)(32 - bits)) : 0;
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up @@
      */
     void INET_util_get_mask4 (struct in_addr *out, int bits)
     {
-      *(DWORD*)out = bits ? swap32 (~0 << (32 - bits)) : 0;
+      *(DWORD*)out = bits ? swap32 (~0UL << (DWORD)(32 - bits)) : 0;
     }
     /**
@@ Expand Down @@