Mercurial > vim
comparison src/channel.c @ 13598:8723e4496dd1 v8.0.1671
patch 8.0.1671: crash when passing non-dict argument as env to job_start()
commit https://github.com/vim/vim/commit/22efba47deb7e504142487fdc1617ec638cf0683
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 7 13:22:21 2018 +0200
patch 8.0.1671: crash when passing non-dict argument as env to job_start()
Problem: Crash when passing non-dict argument as env to job_start().
Solution: Check for valid argument. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/2765)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 07 Apr 2018 13:30:06 +0200 |
| parents | 97720d9a01d4 |
| children | 2a2b668cf24c |
comparison
equal
deleted
inserted
replaced
| 13597:3010125c4ab8 | 13598:8723e4496dd1 |
|---|---|
| 4795 #endif | 4795 #endif |
| 4796 else if (STRCMP(hi->hi_key, "env") == 0) | 4796 else if (STRCMP(hi->hi_key, "env") == 0) |
| 4797 { | 4797 { |
| 4798 if (!(supported2 & JO2_ENV)) | 4798 if (!(supported2 & JO2_ENV)) |
| 4799 break; | 4799 break; |
| 4800 if (item->v_type != VAR_DICT) | |
| 4801 { | |
| 4802 EMSG2(_(e_invargval), "env"); | |
| 4803 return FAIL; | |
| 4804 } | |
| 4800 opt->jo_set2 |= JO2_ENV; | 4805 opt->jo_set2 |= JO2_ENV; |
| 4801 opt->jo_env = item->vval.v_dict; | 4806 opt->jo_env = item->vval.v_dict; |
| 4802 ++item->vval.v_dict->dv_refcount; | 4807 if (opt->jo_env != NULL) |
| 4808 ++opt->jo_env->dv_refcount; | |
| 4803 } | 4809 } |
| 4804 else if (STRCMP(hi->hi_key, "cwd") == 0) | 4810 else if (STRCMP(hi->hi_key, "cwd") == 0) |
| 4805 { | 4811 { |
| 4806 if (!(supported2 & JO2_CWD)) | 4812 if (!(supported2 & JO2_CWD)) |
| 4807 break; | 4813 break; |