Changeset 94977 in vbox

Timestamp:

May 10, 2022 9:45:57 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Network/lwip-new/ipv4/ip_frag.c: Missing paranthesis around ternary operator in macro, bugref:3409

File:

• trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv4/ip_frag.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv4/ip_frag.c

@@ -100 +100 @@
 #endif
 
+#ifndef VBOX
 #define IP_ADDRESSES_AND_ID_MATCH(iphdrA, iphdrB)  \
   (ip_addr_cmp(&(iphdrA)->src, &(iphdrB)->src) && \
    ip_addr_cmp(&(iphdrA)->dest, &(iphdrB)->dest) && \
    IPH_ID(iphdrA) == IPH_ID(iphdrB)) ? 1 : 0
+#else
+/*
+ * Put parantheses around the whole construct so the ternary operator works
+ * as anticipated.
+ */
+#define IP_ADDRESSES_AND_ID_MATCH(iphdrA, iphdrB)  \
+  ((ip_addr_cmp(&(iphdrA)->src, &(iphdrB)->src) && \
+    ip_addr_cmp(&(iphdrA)->dest, &(iphdrB)->dest) && \
+    IPH_ID(iphdrA) == IPH_ID(iphdrB)) ? 1 : 0)
+#endif
 
 /* global variables */