>From b1c219384e22fa97ee6fbad7f831b2dddde18c54 Mon Sep 17 00:00:00 2001
From: Assaf Gordon <address@hidden>
Date: Tue, 31 Jul 2018 12:18:26 -0600
Subject: [PATCH] regex: fix memory leak in multibyte character set regexes.

* lib/regcomp.c (free_charset): Always free range_{starts,ends} member
variables; They are defined in 'struct re_charset_t' even if not _LIBC.
---
 ChangeLog     | 6 ++++++
 lib/regcomp.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 07e970c10..2d245ebc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-31  Assaf Gordon <address@hidden>
+
+	regex: fix memory leak in multibyte character set regexes.
+	* lib/regcomp.c (free_charset): Always free range_{starts,ends} member
+	variables; They are defined in 'struct re_charset_t' even if not _LIBC.
+
 2018-07-27  Bruno Haible  <address@hidden>
 
 	iswcntrl: Mention minor problem on macOS.
diff --git a/lib/regcomp.c b/lib/regcomp.c
index 7b5ddaad0..b08a0de6c 100644
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -3802,9 +3802,9 @@ free_charset (re_charset_t *cset)
 # ifdef _LIBC
   re_free (cset->coll_syms);
   re_free (cset->equiv_classes);
+# endif
   re_free (cset->range_starts);
   re_free (cset->range_ends);
-# endif
   re_free (cset->char_classes);
   re_free (cset);
 }
-- 
2.11.0