[asterisk-commits] markm: branch 10 r364650 - in /branches/10: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: markm
Date: Mon Apr 30 11:43:11 2012
New Revision: 364650

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

Modified:
    branches/10/   (props changed)
    branches/10/main/logger.c

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

Modified: branches/10/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/logger.c?view=diff&rev=364650&r1=364649&r2=364650
==============================================================================
--- branches/10/main/logger.c (original)
+++ branches/10/main/logger.c Mon Apr 30 11:43:11 2012
@@ -1374,6 +1374,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, '/'))) {