AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't macro-expand failed assertion expression [BZ #18604]

Browse Source 
[BZ #18604]
	* assert/assert.h (assert): Don't macro-expand failed assertion
	expression in error message.
	* malloc/malloc.c (assert): Likewise.
This commit is contained in:
David Kastrup 2015-11-03 23:08:54 +01:00 committed by Florian Weimer
parent cf09d0b052
commit 8ba14398e6
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2015-11-03 Joseph Myers <joseph@codesourcery.com>
* configure.ac (libc_cv_ld_no_whole_archive): Remove configure * configure.ac (libc_cv_ld_no_whole_archive): Remove configure

2
assert/assert.h
View File

@ -85,7 +85,7 @@ __END_DECLS
# define assert(expr) \ # define assert(expr) \
((expr) \ ((expr) \
? __ASSERT_VOID_CAST (0) \ ? __ASSERT_VOID_CAST (0) \
: __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION)) : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
# ifdef __USE_GNU # ifdef __USE_GNU
# define assert_perror(errnum) \ # define assert_perror(errnum) \

2
malloc/malloc.c
View File

@ -283,7 +283,7 @@
# define assert(expr) \ # define assert(expr) \
((expr) \ ((expr) \
? ((void) 0) \ ? ((void) 0) \
: __malloc_assert (__STRING (expr), __FILE__, __LINE__, __func__)) : __malloc_assert (#expr, __FILE__, __LINE__, __func__))
extern const char *__progname; extern const char *__progname;