nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8

Browse Source
This commit is contained in:
Nick Mathewson 2016-04-12 13:02:02 -04:00
commit 7babf33239
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug18716 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (assert, portability):
- Fix an assertion failure in memarea.c on systems where "long" is
shorter than the size of a pointer.
Fixes bug 18716; bugfix on 0.2.1.1-alpha

4
src/common/memarea.c
View File

@ -24,9 +24,9 @@
/** A value which, when masked out of a pointer, produces a maximally aligned /** A value which, when masked out of a pointer, produces a maximally aligned
* pointer. */ * pointer. */
#if MEMAREA_ALIGN == 4 #if MEMAREA_ALIGN == 4
#define MEMAREA_ALIGN_MASK 3lu #define MEMAREA_ALIGN_MASK ((uintptr_t)3)
#elif MEMAREA_ALIGN == 8 #elif MEMAREA_ALIGN == 8
#define MEMAREA_ALIGN_MASK 7lu #define MEMAREA_ALIGN_MASK ((uintptr_t)7)
#else #else
#error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff."
#endif #endif