From: Mark Murawki <markm@intellasoft.net>
Date: Mon, 30 Apr 2012 16:43:11 +0000 (+0000)
Subject: Merged revisions 364635 via svnmerge from
X-Git-Tag: 10.5.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af06916f4e05799ac6b00275869fc4cd16f3f325;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@364650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/logger.c b/main/logger.c
index 91d716ce0c..fcb13a9917 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -1374,6 +1374,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, '/'))) {