From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 May 2016 13:22:02 +0000 (-0400)
Subject: Merge branch 'memarea_overflow_027_squashed' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~8^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6abceca1826a018fb51e419fc4eb9721dd501acf;p=thirdparty%2Ftor.git

Merge branch 'memarea_overflow_027_squashed' into maint-0.2.8
---

6abceca1826a018fb51e419fc4eb9721dd501acf
diff --cc src/common/memarea.c
index 0a3fd009b0,d6cad1140a..173ed4e1cb
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@@ -83,10 -80,8 +83,9 @@@ typedef struct memarea_chunk_t 
    struct memarea_chunk_t *next_chunk;
    size_t mem_size; /**< How much RAM is available in mem, total? */
    char *next_mem; /**< Next position in mem to allocate data at.  If it's
-                    * greater than or equal to mem+mem_size, this chunk is
-                    * full. */
+                    * equal to mem+mem_size, this chunk is full. */
  #ifdef USE_ALIGNED_ATTRIBUTE
 +  /** Actual content of the memory chunk. */
    char mem[FLEXIBLE_ARRAY_MEMBER] __attribute__((aligned(MEMAREA_ALIGN)));
  #else
    union {