diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-02-16 00:37:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 00:37:35 +0100 |
| commit | 4031e93c45f8034b771243854c38028e68078d55 (patch) | |
| tree | b0b17448634d48e6f6968f06bace2931c288b266 | |
| parent | 969cc55993919530b2a96e30f02fe71711cab28a (diff) | |
| parent | 3d3a54f45551a9071c67adbea32dab5c7e70b88b (diff) | |
| download | rneovim-4031e93c45f8034b771243854c38028e68078d55.tar.gz rneovim-4031e93c45f8034b771243854c38028e68078d55.tar.bz2 rneovim-4031e93c45f8034b771243854c38028e68078d55.zip | |
Merge #9614
| -rw-r--r-- | src/nvim/garray.c | 4 | ||||
| -rw-r--r-- | src/nvim/window.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/garray.c b/src/nvim/garray.c index 2d2af54c95..74fd9d89cb 100644 --- a/src/nvim/garray.c +++ b/src/nvim/garray.c @@ -91,8 +91,8 @@ void ga_grow(garray_T *gap, int n) } int new_maxlen = gap->ga_len + n; - size_t new_size = (size_t)(gap->ga_itemsize * new_maxlen); - size_t old_size = (size_t)(gap->ga_itemsize * gap->ga_maxlen); + size_t new_size = (size_t)gap->ga_itemsize * (size_t)new_maxlen; + size_t old_size = (size_t)gap->ga_itemsize * (size_t)gap->ga_maxlen; // reallocate and clear the new memory char *pp = xrealloc(gap->ga_data, new_size); diff --git a/src/nvim/window.c b/src/nvim/window.c index e8b067d46c..24fe529fd6 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1300,6 +1300,7 @@ static void win_rotate(int upwards, int count) if (upwards) { /* first window becomes last window */ /* remove first window/frame from the list */ frp = curwin->w_frame->fr_parent->fr_child; + assert(frp != NULL); wp1 = frp->fr_win; win_remove(wp1, NULL); frame_remove(frp); |