From: David Vossel <dvossel@digium.com>
Date: Fri, 8 May 2009 14:54:15 +0000 (+0000)
Subject: Merged revisions 193263 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40841203d462366069190bed198912db00db1beb;p=thirdparty%2Fasterisk.git

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


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

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index d5879fa420..95485ffd62 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -794,7 +794,9 @@ void misdn_cfg_get_config_string (int port, enum misdn_cfg_elements elem, char*
 				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;