diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-26 15:54:03 +0300 | 
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-26 15:54:03 +0300 | 
| commit | b9c78130587e42ca3b6417b47fb739a166da8eb7 (patch) | |
| tree | 142cf7dd0a87dfb32a20838e7683dd1980e4b3e7 /src/nvim/api/private/helpers.c | |
| parent | 05a3c12118a6dae0ac8f3603f9ee4d9fd9450cce (diff) | |
| parent | 207b7ca4bc16d52641eaa5244eef25a0dba91dbc (diff) | |
| download | rneovim-b9c78130587e42ca3b6417b47fb739a166da8eb7.tar.gz rneovim-b9c78130587e42ca3b6417b47fb739a166da8eb7.tar.bz2 rneovim-b9c78130587e42ca3b6417b47fb739a166da8eb7.zip  | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'src/nvim/api/private/helpers.c')
| -rw-r--r-- | src/nvim/api/private/helpers.c | 9 | 
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index 2944925a9c..629873998e 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -12,6 +12,7 @@  #include "nvim/api/private/handle.h"  #include "nvim/msgpack_rpc/helpers.h"  #include "nvim/ascii.h" +#include "nvim/assert.h"  #include "nvim/vim.h"  #include "nvim/buffer.h"  #include "nvim/window.h" @@ -760,12 +761,8 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)      case kObjectTypeWindow:      case kObjectTypeTabpage:      case kObjectTypeInteger: -      if (obj.data.integer > VARNUMBER_MAX -          || obj.data.integer < VARNUMBER_MIN) { -        api_set_error(err, kErrorTypeValidation, "Integer value outside range"); -        return false; -      } - +      STATIC_ASSERT(sizeof(obj.data.integer) <= sizeof(varnumber_T), +                    "Integer size must be <= VimL number size");        tv->v_type = VAR_NUMBER;        tv->vval.v_number = (varnumber_T)obj.data.integer;        break;  | 
