[svn-commits] dvossel: branch 1.6.0 r193264 - in /branches/1.6.0: ./ channels/misdn_config.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri May  8 09:53:28 2009
New Revision: 193264

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=193264
Log:
Merged revisions 193263 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r193263 | dvossel | 2009-05-08 09:52:19 -0500 (Fri, 08 May 2009) | 15 lines
  
  Merged revisions 193262 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193262 | dvossel | 2009-05-08 09:51:09 -0500 (Fri, 08 May 2009) | 9 lines
    
    "misdn show config" segfaults asterisk, if no MSN lists 
    
    (closes issue #14976)
    Reported by: alecdavis
    Patches:
          misdn_config.diff.txt uploaded by alecdavis (license 585)
    Tested by: alecdavis, FabienToune
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/misdn_config.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/misdn_config.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/misdn_config.c?view=diff&rev=193264&r1=193263&r2=193264
==============================================================================
--- branches/1.6.0/channels/misdn_config.c (original)
+++ branches/1.6.0/channels/misdn_config.c Fri May  8 09:53:28 2009
@@ -797,7 +797,9 @@
 				for (; iter; iter = iter->next) {
 					strncat(tempbuf, iter->msn, sizeof(tempbuf) - strlen(tempbuf) - 1);
 				}
-				tempbuf[strlen(tempbuf)-2] = 0;
+				if (strlen(tempbuf) > 1) {
+					tempbuf[strlen(tempbuf)-2] = 0;
+				}
 			}
 			snprintf(buf, bufsize, " -> msns: %s", *tempbuf ? tempbuf : "none");
 			break;