Prepare compression functions for fuzzing

diff --git a/src/openvpn/comp-lz4.c b/src/openvpn/comp-lz4.c
index 6e40c325cfd5f8fbbdc5dcbd30979d4d5f78bdc5..3d5ddaedac0afad232ac7f07f12822c97243285d 100644 (file)
--- a/src/openvpn/comp-lz4.c
+++ b/src/openvpn/comp-lz4.c
@@ -139,7 +139,10 @@ lz4_compress(struct buffer *buf, struct buffer work,
         {
             uint8_t *head = BPTR(buf);
             uint8_t *tail  = BEND(buf);
-            ASSERT(buf_safe(buf, 1));
+            if ( !(buf_safe(buf, 1)) )
+            {
+                return;
+            }
             ++buf->len;
 
             /* move head byte of payload to tail */

diff --git a/src/openvpn/comp.c b/src/openvpn/comp.c
index 4cda7e5ee4086442cf957ce62bb4d3bd0ab9d33d..2b8c2ec769d10531248627866fdd61d15532ec78 100644 (file)
--- a/src/openvpn/comp.c
+++ b/src/openvpn/comp.c
@@ -98,7 +98,10 @@ compv2_escape_data_ifneeded(struct buffer *buf)
     }
 
     /* Header is 0x50 */
-    ASSERT(buf_prepend(buf, 2));
+    if ( !(buf_prepend(buf, 2)) )
+    {
+        return;
+    }
 
     head = BPTR(buf);
     head[0] = COMP_ALGV2_INDICATOR_BYTE;

diff --git a/src/openvpn/compstub.c b/src/openvpn/compstub.c
index ca90924e6a7c5d50aeee6ffbe962d675688b82fc..a203767cc84b1873b0ec3b09cce4354f94d6dca9 100644 (file)
--- a/src/openvpn/compstub.c
+++ b/src/openvpn/compstub.c
@@ -60,7 +60,10 @@ stub_compress(struct buffer *buf, struct buffer work,
     {
         uint8_t *head = BPTR(buf);
         uint8_t *tail  = BEND(buf);
-        ASSERT(buf_safe(buf, 1));
+        if ( !(buf_safe(buf, 1)) )
+        {
+            return;
+        }
         ++buf->len;
 
         /* move head byte of payload to tail */
@@ -70,7 +73,10 @@ stub_compress(struct buffer *buf, struct buffer work,
     else
     {
         uint8_t *header = buf_prepend(buf, 1);
-        *header = NO_COMPRESS_BYTE;
+        if (header)
+        {
+            *header = NO_COMPRESS_BYTE;
+        }
     }
 }
 

diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c
index f754865653faef41a663477bb700c27bb5beea81..a9de5fa26ed8a0af84fabd99c6a25f661ee81f37 100644 (file)
--- a/src/openvpn/lzo.c
+++ b/src/openvpn/lzo.c
@@ -202,7 +202,10 @@ lzo_compress(struct buffer *buf, struct buffer work,
     else
     {
         uint8_t *header = buf_prepend(buf, 1);
-        *header = NO_COMPRESS_BYTE;
+        if (header)
+        {
+            *header = NO_COMPRESS_BYTE;
+        }
     }
 }