[svn-commits] dvossel: trunk r193263 - in /trunk: ./ channels/misdn_config.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri May  8 09:52:19 2009
New Revision: 193263

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=193263
Log:
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:
    trunk/   (props changed)
    trunk/channels/misdn_config.c

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

Modified: trunk/channels/misdn_config.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/misdn_config.c?view=diff&rev=193263&r1=193262&r2=193263
==============================================================================
--- trunk/channels/misdn_config.c (original)
+++ trunk/channels/misdn_config.c Fri May  8 09:52:19 2009
@@ -821,7 +821,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;