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

r18785@catbus: nickm | 2008-03-13 11:07:18 -0400 

Backport: Have OpenBSD_malloc_Linux.c use SIZE_T_MAX from torint.h, instead of checking cpu macros.  There is always one more cpu you havent checked for. fixes bug 625.


svn:r14002
This commit is contained in:
Nick Mathewson 2008-03-13 15:07:21 +00:00
parent 9349137f6e
commit fc33b331df
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21,6 +21,8 @@ Changes in version 0.2.0.22-rc - 2008-03-??
(sometimes) to buffer data for the network. Looking at different BIOs (sometimes) to buffer data for the network. Looking at different BIOs
could result in write counts on the order of ULONG_MAX. Fix for bug could result in write counts on the order of ULONG_MAX. Fix for bug
614. Bugfix on 0.1.2.x. 614. Bugfix on 0.1.2.x.
- Make --enable-openbsd-malloc work correctly on Linux with alpha CPUs.
Fixes bug 625. Bugfix on 0.2.0.x.
Changes in version 0.2.0.21-rc - 2008-03-02 Changes in version 0.2.0.21-rc - 2008-03-02

14
src/common/OpenBSD_malloc_Linux.c
View File

@ -54,6 +54,7 @@
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>
#include <err.h> #include <err.h>
#include "torint.h"
//#include "thread_private.h" //#include "thread_private.h"
@ -1926,11 +1927,14 @@ realloc(void *ptr, size_t size)
return (r); return (r);
} }
#if defined(__i386__)||defined(__arm__)||defined(__powerpc__) #ifndef SIZE_MAX
#define SIZE_MAX 0xffffffff //#if defined(__i386__)||defined(__arm__)||defined(__powerpc__)
#endif //#define SIZE_MAX 0xffffffff
#if defined(__x86_64__) //#endif
#define SIZE_MAX 0xffffffffffffffff //#if defined(__x86_64__)
//#define SIZE_MAX 0xffffffffffffffff
//#endif
#define SIZE_MAX SIZE_T_MAX
#endif #endif
void * void *