diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-08-23 18:07:40 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-23 18:07:40 +0000 |
| commit | 46b9e5450fbd1af030812b1933e769c86baa4932 (patch) | |
| tree | d489beee420ef5d34a873cab5c35ce9fcc23561a /channels/sig_pri.c | |
| parent | 32a0567c461ee426817e476724e206d603fe1e70 (diff) | |
Fix memory corruption when trying to get "core show locks".
Review https://reviewboard.asterisk.org/r/2580/ tried to fix the mismatch
in memory pools but had a math error determining the buffer size and
didn't address other similar memory pool mismatches.
* Effectively reverted the previous patch to go in the same direction as
trunk for the returned memory pool of ast_bt_get_symbols().
* Fixed memory leak in ast_bt_get_symbols() when BETTER_BACKTRACES is
defined.
* Fixed some formatting in ast_bt_get_symbols().
* Fixed sig_pri.c freeing memory allocated by libpri when MALLOC_DEBUG is
enabled.
* Fixed __dump_backtrace() freeing memory from ast_bt_get_symbols() when
MALLOC_DEBUG is enabled.
* Moved __dump_backtrace() because of compile issues with the utils
directory.
(closes issue ASTERISK-22221)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2778/
........
Merged revisions 397525 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 397528 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_pri.c')
| -rw-r--r-- | channels/sig_pri.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 8a63600bf..b6a04b67f 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -9430,7 +9430,7 @@ void sig_pri_cli_show_span(int fd, int *dchannels, struct sig_pri_span *pri) info_str = pri_dump_info_str(pri->pri); if (info_str) { ast_cli(fd, "%s", info_str); - free(info_str); + ast_std_free(info_str); } #else pri_dump_info(pri->pri); |