walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid C++ undefined behavior 

https://bugzilla.mozilla.org/show_bug.cgi?id=810823
This commit is contained in:
Behdad Esfahbod 2012-11-15 10:47:14 -08:00
parent f41dc2d35b
commit fd0de881f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-open-type-private.hh
View File

@ -138,13 +138,13 @@ static const void *_NullPool[64 / sizeof (void *)];
/* Generic nul-content Null objects. */ /* Generic nul-content Null objects. */
template <typename Type> template <typename Type>
static inline const Type& Null (void) { static inline const Type& Null (void) {
ASSERT_STATIC (Type::min_size <= sizeof (_NullPool)); ASSERT_STATIC (sizeof (Type) <= sizeof (_NullPool));
return *CastP<Type> (_NullPool); return *CastP<Type> (_NullPool);
} }
/* Specializaiton for arbitrary-content arbitrary-sized Null objects. */ /* Specializaiton for arbitrary-content arbitrary-sized Null objects. */
#define DEFINE_NULL_DATA(Type, data) \ #define DEFINE_NULL_DATA(Type, data) \
static const char _Null##Type[Type::min_size + 1] = data; /* +1 is for nul-termination in data */ \ static const char _Null##Type[sizeof (Type) + 1] = data; /* +1 is for nul-termination in data */ \
template <> \ template <> \
inline const Type& Null<Type> (void) { \ inline const Type& Null<Type> (void) { \
return *CastP<Type> (_Null##Type); \ return *CastP<Type> (_Null##Type); \