[tor-commits] [tor/master] Merge branch 'memarea_overflow_027_squashed' into maint-0.2.8

[nickm at torproject.org]

commit 6abceca1826a018fb51e419fc4eb9721dd501acf
Merge: 87134db be2d37a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 25 09:22:02 2016 -0400

    Merge branch 'memarea_overflow_027_squashed' into maint-0.2.8

 changes/memarea_overflow | 7 +++++++
 src/common/memarea.c     | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --cc src/common/memarea.c
index 0a3fd00,d6cad11..173ed4e
--- 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 {