diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-26 23:28:56 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 18:57:34 -0300 |
| commit | 5cf3dec9a98717d171e15729d9320d9ebe5ba7eb (patch) | |
| tree | cbaca962880338f6ac696634ff248e7f9ab5623e | |
| parent | d2d99454e63c0e6649fddd52bbd9a10d27c2e347 (diff) | |
| download | rneovim-5cf3dec9a98717d171e15729d9320d9ebe5ba7eb.tar.gz rneovim-5cf3dec9a98717d171e15729d9320d9ebe5ba7eb.tar.bz2 rneovim-5cf3dec9a98717d171e15729d9320d9ebe5ba7eb.zip | |
syntax: Fix possible invalid read in hl_combine_attr
| -rw-r--r-- | src/nvim/syntax.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 0da79cb8ae..c339468233 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -6723,6 +6723,10 @@ int hl_combine_attr(int char_attr, int prim_attr) return prim_attr; } + if (prim_attr == 0) { + return char_attr; + } + // Find the entry for char_attr char_aep = syn_cterm_attr2entry(char_attr); |