diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-29 13:39:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-29 13:39:17 +0200 |
| commit | e3d4685f1f716e0c516332101d85e0930f20fc59 (patch) | |
| tree | 60b4b08d87d23ceb87227df3bedf8aa16305f21c /src/globals.h | |
| parent | 423a85a11a9d3d658906aea715fed7fe6aa83cd8 (diff) | |
patch 8.2.1539: using invalid script ID causes a crashv8.2.1539
Problem: Using invalid script ID causes a crash.
Solution: Check the script ID to be valid. (closes #6804)
Diffstat (limited to 'src/globals.h')
| -rw-r--r-- | src/globals.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/globals.h b/src/globals.h index e883c56f63..1a764b5091 100644 --- a/src/globals.h +++ b/src/globals.h @@ -297,8 +297,9 @@ EXTERN int do_profiling INIT(= PROF_NONE); // PROF_ values # endif EXTERN garray_T script_items INIT5(0, 0, sizeof(scriptitem_T *), 20, NULL); # define SCRIPT_ITEM(id) (((scriptitem_T **)script_items.ga_data)[(id) - 1]) -# define SCRIPT_SV(id) (SCRIPT_ITEM(id)->sn_vars) -# define SCRIPT_VARS(id) (SCRIPT_SV(id)->sv_dict.dv_hashtab) +# define SCRIPT_ID_VALID(id) ((id) > 0 && (id) <= script_items.ga_len) +# define SCRIPT_SV(id) (SCRIPT_ITEM(id)->sn_vars) +# define SCRIPT_VARS(id) (SCRIPT_SV(id)->sv_dict.dv_hashtab) # define FUNCLINE(fp, j) ((char_u **)(fp->uf_lines.ga_data))[j] |