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

Merge branch 'maint-0.2.6' into release-0.2.6

Browse Source
This commit is contained in:
Nick Mathewson 2015-03-09 19:47:28 -04:00
commit ff1f6c417c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

12
src/common/compat.h
View File

@ -215,6 +215,18 @@ extern INLINE double U64_TO_DBL(uint64_t x) {
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#endif #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 #ifndef HAVE_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2));
#endif #endif