This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.27.9000-552-g1002d70


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  1002d708232dda9ebff65f6c1409fa067a01b6e0 (commit)
      from  34fdb893e0cec55bdfc83ce56ab29b8f5eeaef9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1002d708232dda9ebff65f6c1409fa067a01b6e0

commit 1002d708232dda9ebff65f6c1409fa067a01b6e0
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Wed Jul 4 17:26:22 2018 -0300

    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.

diff --git a/ChangeLog b/ChangeLog
index 9e58262..2e8308e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]
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);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |    4 ++++
 posix/bug-regex33.c |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]