diff options
author | David Vossel <dvossel@digium.com> | 2009-05-08 14:52:19 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2009-05-08 14:52:19 +0000 |
commit | 86d63dc261b16b5a982b569ce1dc799148aa6fad (patch) | |
tree | f78e4c85d45af2337633a78bb592e46e0e2b97a5 /channels | |
parent | 7893ab8fe73732ff6d16389a3a56da53d1a0460a (diff) |
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/trunk@193263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-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 3643d67e2..293b8f8cb 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -821,7 +821,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; |