Merge branch 'maint-0.2.7'

This commit is contained in:
Nick Mathewson 2016-02-23 14:05:54 -05:00
commit a7f303a481
2 changed files with 13 additions and 0 deletions

4
changes/bug14821 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (compilation):
- Correctly repair hardened builds under the clang compiler. Previously,
our use of _FORTIFY_SOURCE would conflict with clang's address
sanitizer. Closes ticket 14821.

View File

@ -42,6 +42,15 @@
#include <netinet6/in6.h> #include <netinet6/in6.h>
#endif #endif
#if defined(__has_feature)
# if __has_feature(address_sanitizer)
/* Some of the fancy glibc strcmp() macros include references to memory that
* clang rejects because it is off the end of a less-than-3. Clang hates this,
* even though those references never actually happen. */
# undef strcmp
# endif
#endif
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>