Fix IPAddress packed layout and iovector flex array (#352)

* Fix IPAddr memory layout * Ignore GCC13 new warning for flex array inheritance
alibaba · Feb 6, 2024 · 1bf5242 · 1bf5242
1 parent 0801372
commit 1bf5242
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/common/iovector.h b/common/iovector.h
@@ -236,6 +236,10 @@ inline void delete_iovector(iovector* ptr);
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
+#if __GNUC_MINOR__ >= 13
+#pragma GCC diagnostic ignored "-Wzero-length-bounds"
+#pragma GCC diagnostic ignored "-Wstrict-flex-arrays"
+#endif
 
 class iovector
 {
@@ -861,7 +865,7 @@ class iovector
 
     struct IOVAllocation_ : public IOAlloc
     {
-        void* bases[0];
+        void* bases[];
         void* do_allocate(int size, uint16_t& nbases, uint16_t capacity)
         {
             return do_allocate(size, size, nbases, capacity);

diff --git a/net/socket.h b/net/socket.h
@@ -47,7 +47,7 @@ namespace net {
         union {
             in6_addr addr = {};
             struct { uint16_t _1, _2, _3, _4, _5, _6; uint8_t a, b, c, d; };
-        };
+        } __attribute__((packed));
         // For compatibility, the default constructor is still 0.0.0.0 (IPv4)
         IPAddr() {
             map_v4(htonl(INADDR_ANY));