This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] posix: Fix bug-regex33 after regex sync
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Wed, 4 Jul 2018 17:30:42 -0300
- Subject: [COMMITTED] posix: Fix bug-regex33 after regex sync
On some platforms the inclusion of regex-internal.h in bug-regex33
testcase show a MAX redefinition if test-skeleton.c is include later.
This patch fixes by removing regex-internal.h inclusion and using
SBC_MAX value directly.
Checked on aarch64-linux-gnu.
* posix/bug-regex33.c: Fix build after regex sync.
---
ChangeLog | 4 ++++
posix/bug-regex33.c | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/posix/bug-regex33.c b/posix/bug-regex33.c
index 0313cb4..015b73c 100644
--- a/posix/bug-regex33.c
+++ b/posix/bug-regex33.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "regex_internal.h"
static int
do_test (void)
@@ -39,8 +38,9 @@ do_test (void)
memset (&r, 0, sizeof (r));
memset (&s, 0, sizeof (s));
- /* The bug cannot be reproduced without initialized fastmap. */
- r.fastmap = malloc (SBC_MAX);
+ /* The bug cannot be reproduced without initialized fastmap (it is SBC_MAX
+ value from regex_internal.h). */
+ r.fastmap = malloc (UCHAR_MAX + 1);
/* 圭 */
re_compile_pattern ("\xb7\xbd", 2, &r);
--
2.7.4