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.22-497-g8ba1439


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  8ba14398e629c1f63b9c91a59a47a713b3cce8bc (commit)
      from  cf09d0b052cbbfbcabc3c3d78d485876b9b81f9c (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=8ba14398e629c1f63b9c91a59a47a713b3cce8bc

commit 8ba14398e629c1f63b9c91a59a47a713b3cce8bc
Author: David Kastrup <dak@gnu.org>
Date:   Tue Nov 3 23:08:54 2015 +0100

    Don't macro-expand failed assertion expression [BZ #18604]
    
    	[BZ #18604]
    	* assert/assert.h (assert): Don't macro-expand failed assertion
    	expression in error message.
    	* malloc/malloc.c (assert): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0abea41..35922ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-03  David Kastrup  <dak@gnu.org>
+
+	[BZ #18604]
+	* assert/assert.h (assert): Don't macro-expand failed assertion
+	expression in error message.
+	* malloc/malloc.c (assert): Likewise.
+
 2015-11-03  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac (libc_cv_ld_no_whole_archive): Remove configure
diff --git a/assert/assert.h b/assert/assert.h
index d04c58c..40b9848 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -85,7 +85,7 @@ __END_DECLS
 # define assert(expr)							\
   ((expr)								\
    ? __ASSERT_VOID_CAST (0)						\
-   : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
+   : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
 
 # ifdef	__USE_GNU
 #  define assert_perror(errnum)						\
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 35c8863..839263e 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -283,7 +283,7 @@
 # define assert(expr) \
   ((expr)								      \
    ? ((void) 0)								      \
-   : __malloc_assert (__STRING (expr), __FILE__, __LINE__, __func__))
+   : __malloc_assert (#expr, __FILE__, __LINE__, __func__))
 
 extern const char *__progname;
 

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

Summary of changes:
 ChangeLog       |    7 +++++++
 assert/assert.h |    2 +-
 malloc/malloc.c |    2 +-
 3 files changed, 9 insertions(+), 2 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]