aboutsummaryrefslogtreecommitdiffstats
path: root/channels/misdn_config.c
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-08 14:55:05 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-08 14:55:05 +0000
commit279355eab5133c6876c9e6e9607a73eecfce4dba (patch)
tree5c0d29ad5386c32c7c62bf8aeadaf7bee0e045c9 /channels/misdn_config.c
parentff39d4be7e6cc5287cff54c9510ad190c2da5dd8 (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.2@193266 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn_config.c')
-rw-r--r--channels/misdn_config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 50d18ed57..81f1d8b03 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;