diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-12-25 21:02:27 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-01-03 06:39:23 +0300 |
| commit | 27343bc5b2b56cba76059c117fb97b558bc7bc78 (patch) | |
| tree | 9caba922e7dd1db86b5128338c5356c39790c997 /src/nvim/eval/typval_encode.c.h | |
| parent | b3163d06b340b95ca85421cff8a64c5bc1935f5e (diff) | |
| download | rneovim-27343bc5b2b56cba76059c117fb97b558bc7bc78.tar.gz rneovim-27343bc5b2b56cba76059c117fb97b558bc7bc78.tar.bz2 rneovim-27343bc5b2b56cba76059c117fb97b558bc7bc78.zip | |
eval/typval_encode: Fix crashes
Diffstat (limited to 'src/nvim/eval/typval_encode.c.h')
| -rw-r--r-- | src/nvim/eval/typval_encode.c.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval/typval_encode.c.h b/src/nvim/eval/typval_encode.c.h index d45986396a..8005f7cfcf 100644 --- a/src/nvim/eval/typval_encode.c.h +++ b/src/nvim/eval/typval_encode.c.h @@ -579,9 +579,9 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE( partial_T *const pt = cur_mpsv->data.p.pt; switch (cur_mpsv->data.p.stage) { case kMPConvPartialArgs: { - TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(pt->pt_argc); + TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(pt == NULL ? 0 : pt->pt_argc); cur_mpsv->data.p.stage = kMPConvPartialSelf; - if (pt->pt_argc > 0) { + if (pt != NULL && pt->pt_argc > 0) { TYPVAL_ENCODE_CONV_LIST_START(pt->pt_argc); _mp_push(mpstack, ((MPConvStackVal) { .type = kMPConvPartialList, @@ -599,7 +599,7 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE( } case kMPConvPartialSelf: { cur_mpsv->data.p.stage = kMPConvPartialEnd; - dict_T *const dict = pt->pt_dict; + dict_T *const dict = pt == NULL ? NULL : pt->pt_dict; if (dict != NULL) { TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(dict->dv_hashtab.ht_used); TYPVAL_ENCODE_CONV_DICT_START(dict->dv_hashtab.ht_used); |