Merge branch '4.next'

[exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index ba4767916d8995cb4231d3da59f2cab3a2370641..c851d4bd97b26178587fbb1427d88c7e90f4b00f 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1822,8 +1822,11 @@ for (;;)
   if (ptr >= header_size - 4)
     {
     int oldsize = header_size;
-    /* header_size += 256; */
+
+    if (header_size >= INT_MAX/2)
+      goto OVERSIZE;
     header_size *= 2;
+
     if (!store_extend(next->text, oldsize, header_size))
       next->text = store_newblock(next->text, header_size, ptr);
     }
@@ -1929,6 +1932,7 @@ for (;;)
 
   if (message_size >= header_maxsize)
     {
+OVERSIZE:
     next->text[ptr] = 0;
     next->slen = ptr;
     next->type = htype_other;
@@ -2000,7 +2004,8 @@ for (;;)
     if (nextch == ' ' || nextch == '\t')
       {
       next->text[ptr++] = nextch;
-      message_size++;
+      if (++message_size >= header_maxsize)
+       goto OVERSIZE;
       continue;                      /* Iterate the loop */
       }
     else if (nextch != EOF) (receive_ungetc)(nextch);   /* For next time */