duplicate re_nsub in LSB/glibc ABI compatible location

diff --git a/include/regex.h b/include/regex.h
index 3673bfa..d57208a 100644 (file)
--- a/include/regex.h
+++ b/include/regex.h
@@ -13,7 +13,8 @@ typedef long regoff_t;
 
 typedef struct {
        size_t re_nsub;
 
 typedef struct {
        size_t re_nsub;

-       void *__opaque;
+       void *__opaque, *__padding[4];
+       size_t __nsub2;

 } regex_t;
 
 typedef struct {
 } regex_t;
 
 typedef struct {

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 3307942..875f56f 100644 (file)
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -3115,7 +3115,7 @@ tre_compile(regex_t *preg, const tre_char_t *regex, size_t n, int cflags)
   errcode = tre_parse(&parse_ctx);
   if (errcode != REG_OK)
     ERROR_EXIT(errcode);
   errcode = tre_parse(&parse_ctx);
   if (errcode != REG_OK)
     ERROR_EXIT(errcode);

-  preg->re_nsub = parse_ctx.submatch_id - 1;
+  preg->re_nsub = preg->__nsub2 = parse_ctx.submatch_id - 1;

   tree = parse_ctx.result;
 
 #ifdef TRE_DEBUG
   tree = parse_ctx.result;
 
 #ifdef TRE_DEBUG