[asterisk-commits] markm: trunk r364654 - in /trunk: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: markm
Date: Mon Apr 30 12:17:51 2012
New Revision: 364654

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364654
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/logger.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=364654&r1=364653&r2=364654
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Mon Apr 30 12:17:51 2012
@@ -1519,6 +1519,9 @@
 					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, '/'))) {