AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 19:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

posix: Fix bug-regex33 after regex sync

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella 2018-07-04 17:26:22 -03:00
parent 34fdb893e0
commit 1002d70823
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2018-07-04 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* posix/bug-regex33.c: Fix build after regex sync.
2018-07-04 Carlos O'Donell <carlos@redhat.com>
[BZ #23164]

6
posix/bug-regex33.c
View File

@ -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);