project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix overflow in prng_range().

Browse Source 
Add jemalloc_ffs64() and use it instead of jemalloc_ffsl() in
prng_range(), since long is not guaranteed to be a 64-bit type.
This commit is contained in:
Jason Evans
2016-02-20 23:41:33 -08:00
parent aac93f414e
commit ecae12323d
5 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/jemalloc/internal/util.h
View File

@@ -121,6 +121,7 @@ void malloc_printf(const char *format, ...) JEMALLOC_FORMAT_PRINTF(1, 2);
#ifdef JEMALLOC_H_INLINES
#ifndef JEMALLOC_ENABLE_INLINE
int jemalloc_ffs64(uint64_t bitmap);
int jemalloc_ffsl(long bitmap);
int jemalloc_ffs(int bitmap);
uint64_t pow2_ceil_u64(uint64_t x);
@@ -134,10 +135,24 @@ int get_errno(void);
#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_UTIL_C_))
/* Sanity check. */
#if !defined(JEMALLOC_INTERNAL_FFSL) || !defined(JEMALLOC_INTERNAL_FFS)
# error Both JEMALLOC_INTERNAL_FFSL && JEMALLOC_INTERNAL_FFS should have been defined by configure
#if !defined(JEMALLOC_INTERNAL_FFSLL) || !defined(JEMALLOC_INTERNAL_FFSL) \
|| !defined(JEMALLOC_INTERNAL_FFS)
# error JEMALLOC_INTERNAL_FFS{,L,LL} should have been defined by configure
#endif
JEMALLOC_ALWAYS_INLINE int
jemalloc_ffs64(uint64_t bitmap)
{
#if LG_SIZEOF_LONG == 3
return (JEMALLOC_INTERNAL_FFSL(bitmap));
#elif LG_SIZEOF_LONG_LONG == 3
return (JEMALLOC_INTERNAL_FFSLL(bitmap));
#else
#error No implementation for 64-bit ffs()
#endif
}
JEMALLOC_ALWAYS_INLINE int
jemalloc_ffsl(long bitmap)
{