mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-21 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/typval_encode: Fix crashes

Browse Source
This commit is contained in:
ZyX
2016-12-25 21:02:27 +03:00
parent b3163d06b3
commit 27343bc5b2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval/typval_encode.c.h
View File

@@ -579,9 +579,9 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
partial_T *const pt = cur_mpsv->data.p.pt; partial_T *const pt = cur_mpsv->data.p.pt;
switch (cur_mpsv->data.p.stage) { switch (cur_mpsv->data.p.stage) {
case kMPConvPartialArgs: { 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; 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); TYPVAL_ENCODE_CONV_LIST_START(pt->pt_argc);
_mp_push(mpstack, ((MPConvStackVal) { _mp_push(mpstack, ((MPConvStackVal) {
.type = kMPConvPartialList, .type = kMPConvPartialList,
@@ -599,7 +599,7 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
} }
case kMPConvPartialSelf: { case kMPConvPartialSelf: {
cur_mpsv->data.p.stage = kMPConvPartialEnd; 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) { if (dict != NULL) {
TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(dict->dv_hashtab.ht_used); TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(dict->dv_hashtab.ht_used);
TYPVAL_ENCODE_CONV_DICT_START(dict->dv_hashtab.ht_used); TYPVAL_ENCODE_CONV_DICT_START(dict->dv_hashtab.ht_used);