Merge commit 'origin/maint-0.2.6^'

This commit is contained in:
Nick Mathewson 2015-03-10 08:36:53 -04:00
commit e732ec295d
2 changed files with 17 additions and 0 deletions

5
changes/bug15205 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes (crash, OSX, security):
- Fix a remote denial-of-service opportunity caused by a bug
in OSX's _strlcat_chk() function. Fixes bug 15205; bug first
appeared in OSX 10.9.

View File

@ -215,6 +215,18 @@ extern INLINE double U64_TO_DBL(uint64_t x) {
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#endif
#if defined __APPLE__
/* On OSX 10.9 and later, the overlap-checking code for strlcat would
* appear to have a severe bug that can sometimes cause aborts in Tor.
* Instead, use the non-checking variants. This is sad.
*
* See https://trac.torproject.org/projects/tor/ticket/15205
*/
#undef strlcat
#undef strlcpy
#endif
#ifndef HAVE_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2));
#endif