diff options
author | Richard Mudgett <rmudgett@digium.com> | 2012-11-08 17:38:31 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2012-11-08 17:38:31 +0000 |
commit | 3a9640b6053f28d22c14bdc8e6f0ae4930cb170f (patch) | |
tree | 6316eb31b9f578d65b5cbb7d14a28ad29d4dccce /include/asterisk/utils.h | |
parent | f2bb9afe17ee3e321a2d853dbfed4a93a67c25ca (diff) |
Add MALLOC_DEBUG enhancements.
* Makes malloc() behave like calloc(). It will return a memory block
filled with 0x55. A nonzero value.
* Makes free() fill the released memory block and boundary fence's with
0xdeaddead. Any pointer use after free is going to have a pointer
pointing to 0xdeaddead. The 0xdeaddead pointer is usually an invalid
memory address so a crash is expected.
* Puts the freed memory block into a circular array so it is not reused
immediately.
* When the circular array rotates out a memory block to the heap it checks
that the memory has not been altered from 0xdeaddead.
* Made the astmm_log message wording better.
* Made crash if the DO_CRASH menuselect option is enabled and something is
found.
* Fixed a potential alignment issue on 64 bit systems.
struct ast_region.data[] should now be aligned correctly for all
platforms.
* Extracted region_check_fences() from __ast_free_region() and
handle_memory_show().
* Updated handle_memory_show() CLI usage help.
Review: https://reviewboard.asterisk.org/r/2182/
........
Merged revisions 376029 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 376030 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 376048 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/utils.h')
-rw-r--r-- | include/asterisk/utils.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index e28e33267..7830b85fc 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -729,32 +729,27 @@ int ast_parse_digest(const char *digest, struct ast_http_digest *d, int request, #ifdef AST_DEVMODE +void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function); #define ast_assert(a) _ast_assert(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__) -static void force_inline _ast_assert(int condition, const char *condition_str, - const char *file, int line, const char *function) +static void force_inline _ast_assert(int condition, const char *condition_str, const char *file, int line, const char *function) { if (__builtin_expect(!condition, 1)) { - /* Attempt to put it into the logger, but hope that at least someone saw the - * message on stderr ... */ - ast_log(__LOG_ERROR, file, line, function, "FRACK!, Failed assertion %s (%d)\n", - condition_str, condition); - fprintf(stderr, "FRACK!, Failed assertion %s (%d) at line %d in %s of %s\n", - condition_str, condition, line, function, file); - /* Give the logger a chance to get the message out, just in case we abort(), or - * Asterisk crashes due to whatever problem just happened after we exit ast_assert(). */ - usleep(1); -#ifdef DO_CRASH - abort(); - /* Just in case abort() doesn't work or something else super silly, - * and for Qwell's amusement. */ - *((int*)0)=0; -#endif + __ast_assert_failed(condition, condition_str, file, line, function); } } #else #define ast_assert(a) #endif +/*! + * \brief Force a crash if DO_CRASH is defined. + * + * \note If DO_CRASH is not defined then the function returns. + * + * \return Nothing + */ +void ast_do_crash(void); + #include "asterisk/strings.h" /*! |