diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-08 14:54:15 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-08 14:54:15 +0000 |
| commit | c3e469649a2b8a0d431cbca624b9b626f9a4a5a2 (patch) | |
| tree | d5d15a4101549a85d57bf678aec9aa682e81888c | |
| parent | adda4f89670dfc5bf516542bf6fb5fee2956c4e3 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@193265 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/misdn_config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c index d5879fa42..95485ffd6 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; |