diff options
| author | Sverker Eriksson <[email protected]> | 2014-07-11 18:52:43 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-07-11 18:52:43 +0200 |
| commit | b34d863a66ad6e048854faa171a71e1c8e4997eb (patch) | |
| tree | 5325243cf02d21cb754aa15486a5a93077801916 /erts/emulator/beam/sys.h | |
| parent | 386e8c157fce5d0b9f61a1e8ea03e20b6e875619 (diff) | |
| parent | 1d583e08cd5235881ede6f92800c25ddee13056f (diff) | |
| download | otp-b34d863a66ad6e048854faa171a71e1c8e4997eb.tar.gz otp-b34d863a66ad6e048854faa171a71e1c8e4997eb.tar.bz2 otp-b34d863a66ad6e048854faa171a71e1c8e4997eb.zip | |
Merge branch 'sverk/alloc-size-overflow' into maint
* sverk/alloc-size-overflow:
erts: Fix size overflow bugs in memory allocation
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 05f07e57b2..3d8dd9c6d0 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -274,6 +274,7 @@ __decl_noreturn void __noreturn erl_assert_error(const char* expr, const char *f typedef unsigned int Eterm; typedef unsigned int Uint; typedef int Sint; +#define ERTS_UINT_MAX UINT_MAX #define ERTS_SIZEOF_ETERM SIZEOF_INT #define ErtsStrToSint strtol #else @@ -347,6 +348,7 @@ typedef long long Sint; typedef Uint UWord; typedef Sint SWord; +#define ERTS_UINT_MAX ERTS_UWORD_MAX #endif /* HALFWORD_HEAP */ |