diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-07-15 18:56:45 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-07-15 18:56:45 +0300 |
| commit | 69719e658c48bb5e95a7b57d5813ed4dc48e68e3 (patch) | |
| tree | c4f8584a7437ea6127389b26ff6876404cb58ce7 /src/nvim/shada.c | |
| parent | 7ab152aaa58f493e54d03a15960b8a288196e588 (diff) | |
| parent | 8898793adeb3a82fe50da4258c30940e10ebcc9d (diff) | |
| download | rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.tar.gz rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.tar.bz2 rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.zip | |
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'src/nvim/shada.c')
| -rw-r--r-- | src/nvim/shada.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 4788b1e7d0..736d6bf162 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -3413,8 +3413,16 @@ shada_read_next_item_start: return mru_ret; } - const size_t length = (size_t) length_u64; - entry->timestamp = (Timestamp) timestamp_u64; + if (length_u64 > PTRDIFF_MAX) { + emsgf(_(RCERR "Error while reading ShaDa file: " + "there is an item at position %" PRIu64 " " + "that is stated to be too long"), + initial_fpos); + return kSDReadStatusNotShaDa; + } + + const size_t length = (size_t)length_u64; + entry->timestamp = (Timestamp)timestamp_u64; if (type_u64 == 0) { // kSDItemUnknown cannot possibly pass that far because it is -1 and that |