Merged revisions 222799 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r222799 | rmudgett | 2009-10-08 11:44:33 -0500 (Thu, 08 Oct 2009) | 19 lines

  Merged revisions 222797 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r222797 | rmudgett | 2009-10-08 11:33:06 -0500 (Thu, 08 Oct 2009) | 12 lines

    Fix memory leak if chan_misdn config parameter is repeated.

    Memory leak when the same config option is set more than once in an
    misdn.conf section.  Why must this be considered?  Templates!  Defining a
    template with default port options and later adding to or overriding some
    of them.

    Patches:
          memleak-misdn.patch

    JIRA ABE-1998
  ........
................

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

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 28779f78f453a98c584a69bf198018690c9db578..de30fb53ff9bdefc32b64cc4e8733f8e81f2d5f7 100644 (file)
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -875,6 +875,9 @@ static int _parse (union misdn_cfg_pt *dest, const char *value, enum misdn_cfg_t
 
        switch (type) {
        case MISDN_CTYPE_STR:
+               if (dest->str) {
+                       ast_free(dest->str);
+               }
                if ((len = strlen(value))) {
                        dest->str = ast_malloc((len + 1) * sizeof(char));
                        strncpy(dest->str, value, len);
@@ -894,18 +897,24 @@ static int _parse (union misdn_cfg_pt *dest, const char *value, enum misdn_cfg_t
                        res = sscanf(value, "%30d", &tmp);
                }
                if (res) {
-                       dest->num = ast_malloc(sizeof(int));
+                       if (!dest->num) {
+                               dest->num = ast_malloc(sizeof(int));
+                       }
                        memcpy(dest->num, &tmp, sizeof(int));
                } else
                        re = -1;
        }
                break;
        case MISDN_CTYPE_BOOL:
-               dest->num = ast_malloc(sizeof(int));
+               if (!dest->num) {
+                       dest->num = ast_malloc(sizeof(int));
+               }
                *(dest->num) = (ast_true(value) ? 1 : 0);
                break;
        case MISDN_CTYPE_BOOLINT:
-               dest->num = ast_malloc(sizeof(int));
+               if (!dest->num) {
+                       dest->num = ast_malloc(sizeof(int));
+               }
                if (sscanf(value, "%30d", &tmp)) {
                        memcpy(dest->num, &tmp, sizeof(int));
                } else {
@@ -924,7 +933,9 @@ static int _parse (union misdn_cfg_pt *dest, const char *value, enum misdn_cfg_t
                }
                break;
        case MISDN_CTYPE_ASTGROUP:
-               dest->grp = ast_malloc(sizeof(ast_group_t));
+               if (!dest->grp) {
+                       dest->grp = ast_malloc(sizeof(ast_group_t));
+               }
                *(dest->grp) = ast_get_group(value);
                break;
        }