membuffer: use buffer pointer as flexible array member

diff --git a/src/util-buffer.c b/src/util-buffer.c
index a7d4d8bc0d23028e9aa69378caa1f8d378fa167e..5b52a05dc41eb728aa09e923afbab988b5c4295c 100644 (file)
--- a/src/util-buffer.c
+++ b/src/util-buffer.c
@@ -48,8 +48,6 @@ MemBuffer *MemBufferCreateNew(uint32_t size)
         return NULL;
     }
     buffer->size = size;
-    buffer->buffer = (uint8_t *)buffer + sizeof(MemBuffer);
-
     return buffer;
 }
 
@@ -75,7 +73,6 @@ int MemBufferExpand(MemBuffer **buffer, uint32_t expand_by) {
     }
     *buffer = tbuffer;
     (*buffer)->size += expand_by;
-    (*buffer)->buffer = (uint8_t *)tbuffer + sizeof(MemBuffer);
 
     SCLogDebug("expanded buffer by %u, size is now %u", expand_by, (*buffer)->size);
     return 0;

diff --git a/src/util-buffer.h b/src/util-buffer.h
index e6a0cd0679d2452763b5da406d9c15c02093aeb8..b1fcb62f2be823af2a7c83a659670e65142d61bc 100644 (file)
--- a/src/util-buffer.h
+++ b/src/util-buffer.h
@@ -25,9 +25,9 @@
 #define SURICATA_UTIL_BUFFER_H
 
 typedef struct MemBuffer_ {
-   uint8_t *buffer;
-   uint32_t size;
-   uint32_t offset;
+    uint32_t size;
+    uint32_t offset;
+    uint8_t buffer[];
 } MemBuffer;
 
 MemBuffer *MemBufferCreateNew(uint32_t size);