Merged revisions 193262 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Fri, 8 May 2009 14:52:19 +0000 (14:52 +0000)
committerDavid Vossel <dvossel@digium.com>
Fri, 8 May 2009 14:52:19 +0000 (14:52 +0000)
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

channels/misdn_config.c

index 3643d67..293b8f8 100644 (file)
@@ -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;