mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

STRICT_ADD, STRICT_SUB: Log error before abort

Browse Source
This commit is contained in:
Justin M. Keyes
2019-01-20 00:12:16 +01:00
parent dbba685c69
commit c11b79ce51
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/assert.h
View File

@@ -137,7 +137,12 @@
/// Not used if compiler supports __builtin_add_overflow. /// Not used if compiler supports __builtin_add_overflow.
#ifdef HAVE_BUILTIN_ADD_OVERFLOW #ifdef HAVE_BUILTIN_ADD_OVERFLOW
# define STRICT_ADD(a, b, c, t) \ # define STRICT_ADD(a, b, c, t) \
do { if (__builtin_add_overflow(a, b, c)) { abort(); } } while (0) do { \
if (__builtin_add_overflow(a, b, c)) { \
ELOG("STRICT_ADD overflow"); \
abort(); \
} \
} while (0)
#else #else
# define STRICT_ADD(a, b, c, t) \ # define STRICT_ADD(a, b, c, t) \
do { *(c) = (t)(a + b); } while (0) do { *(c) = (t)(a + b); } while (0)
@@ -147,7 +152,12 @@
/// @brief Subtracts (a - b) and stores result in `c`. Aborts on overflow. /// @brief Subtracts (a - b) and stores result in `c`. Aborts on overflow.
#ifdef HAVE_BUILTIN_ADD_OVERFLOW #ifdef HAVE_BUILTIN_ADD_OVERFLOW
# define STRICT_SUB(a, b, c, t) \ # define STRICT_SUB(a, b, c, t) \
do { if (__builtin_sub_overflow(a, b, c)) { abort(); } } while (0) do { \
if (__builtin_sub_overflow(a, b, c)) { \
ELOG("STRICT_SUB overflow"); \
abort(); \
} \
} while (0)
#else #else
# define STRICT_SUB(a, b, c, t) \ # define STRICT_SUB(a, b, c, t) \
do { *(c) = (t)(a - b); } while (0) do { *(c) = (t)(a - b); } while (0)