regex: fix memory leak in Gnulib

Problem and fix reported by Assaf Gordon in:
https://lists.gnu.org/r/bug-gnulib/2018-07/txtqLKNwBdefE.txt
* posix/regcomp.c (free_charset) [!_LIBC]: Free range_starts and
range_ends members too, as they are defined in 'struct
re_charset_t' even if not _LIBC.  This affects only Gnulib.

diff --git a/ChangeLog b/ChangeLog
index 20d61ee5aa5ba7e228f90f7a98ff62bfd457af48..dc3a4457a99967ca51507da2332c88a4fb5f4349 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       regex: fix memory leak in Gnulib
+       Problem and fix reported by Assaf Gordon in:
+       https://lists.gnu.org/r/bug-gnulib/2018-07/txtqLKNwBdefE.txt
+       * posix/regcomp.c (free_charset) [!_LIBC]: Free range_starts and
+       range_ends members too, as they are defined in 'struct
+       re_charset_t' even if not _LIBC.  This affects only Gnulib.
+
 2018-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86/cpu-features.c (get_common_indeces): Renamed to

diff --git a/posix/regcomp.c b/posix/regcomp.c
index 545d188468c376e7d82d3827a922f0fea87a4c0d..3b0a3c6b6a69a3da50d8fc6d2441021ad0a6c46b 100644 (file)
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -3794,9 +3794,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);
 }