From 5cf3dec9a98717d171e15729d9320d9ebe5ba7eb Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Thu, 26 Feb 2015 23:28:56 -0300
Subject: syntax: Fix possible invalid read in hl_combine_attr

---
 src/nvim/syntax.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/nvim/syntax.c')

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);
 
-- 
cgit