diff options
| author | Mark Murawki <markm@intellasoft.net> | 2012-04-30 17:17:51 +0000 |
|---|---|---|
| committer | Mark Murawki <markm@intellasoft.net> | 2012-04-30 17:17:51 +0000 |
| commit | f3cde589cdff30314ee367163b48a7d361497984 (patch) | |
| tree | 313f347685fa34d20a99afded1eae8feebc1a5ce /main/logger.c | |
| parent | 6d87267542d43d0d6767912243413fbe554fe2fc (diff) | |
Merged revisions 364635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r364635 | markm | 2012-04-30 11:51:12 -0400 (Mon, 30 Apr 2012) | 10 lines
Sanatize result from bfd_find_nearest_line (BETTER_BACKTRACES)
bfd_find_nearest_line can possibly set file to null resulting in a crash when strrchr(file) runs
(closes issue ASTERISK-19815)
Reported by Mark Murawski
Tested by Mark Murawski
........
........
Merged revisions 364650 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@364654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/logger.c')
| -rw-r--r-- | main/logger.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/logger.c b/main/logger.c index fdab40d30..dcef76218 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1519,6 +1519,9 @@ char **ast_bt_get_symbols(void **addresses, size_t num_frames) continue; } + /* file can possibly be null even with a success result from bfd_find_nearest_line */ + file = file ? file : ""; + /* Stack trace output */ found++; if ((lastslash = strrchr(file, '/'))) { |