From 04e555a92e49eb41f4321c67511bec94a86b867a Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Tue, 16 Dec 2014 21:14:16 +0000
Subject: 33981: more care with region_highlights management
---
Src/Zle/zle_refresh.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'Src/Zle/zle_refresh.c')
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 467629d25..9f8075386 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -396,8 +396,9 @@ get_region_highlight(UNUSED(Param pm))
struct region_highlight *rhp;
/* region_highlights may not have been set yet */
- if (arrsize)
- arrsize -= N_SPECIAL_HIGHLIGHTS;
+ if (!arrsize)
+ return hmkarray(NULL);
+ arrsize -= N_SPECIAL_HIGHLIGHTS;
arrp = retarr = (char **)zhalloc((arrsize+1)*sizeof(char *));
/* ignore special highlighting */
@@ -1028,6 +1029,8 @@ zrefresh(void)
/* this will create region_highlights if it's still NULL */
zle_set_highlight();
+ DPUTS(!region_highlights, "region_highlights not created");
+
/* check for region between point ($CURSOR) and mark ($MARK) */
if (region_active) {
if (zlecs <= mark) {
--
cgit 1.4.1