sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r17505@tombo: nickm | 2008-07-31 08:24:58 -0400 

backport buffer chunk size fix


svn:r16448
This commit is contained in:
Nick Mathewson 2008-08-06 16:22:32 +00:00
parent a062b6d306
commit c5ef95b802
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Changes in version 0.2.0.31 - 2008-08-??
o Minor bugfixes:
- Fix a small alignment and memory-wasting bug on buffer chunks. Spotted
by rovv.
Changes in version 0.2.0.30 - 2008-07-15
o Minor bugfixes:
- Stop using __attribute__((nonnull)) with GCC: it can give us useful

6
src/or/buffers.c
View File

@ -63,12 +63,14 @@ typedef struct chunk_t {
* more than one byte long. */
} chunk_t;
#define CHUNK_HEADER_LEN STRUCT_OFFSET(chunk_t, mem[0])
/** Return the number of bytes needed to allocate a chunk to hold
* <b>memlen</b> bytes. */
#define CHUNK_ALLOC_SIZE(memlen) (sizeof(chunk_t) + (memlen) - 1)
#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_HEADER_LEN + (memlen))
/** Return the number of usable bytes in a chunk allocated with
* malloc(<b>memlen</b>). */
#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - sizeof(chunk_t) + 1)
#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_HEADER_LEN)
/** Return the next character in <b>chunk</b> onto which data can be appended.
* If the chunk is full, this might be off the end of chunk->mem. */