From e7f1679373794169594f22444466cf6d907db9b6 Mon Sep 17 00:00:00 2001
From: rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 8 Oct 2009 16:47:21 +0000
Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@222800 f38db490-d61c-443f-a65b-d21fe96a405b
---
 channels/misdn_config.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'channels')

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 5bf24227f..a3b956888 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -878,6 +878,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);
@@ -897,18 +900,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 {
@@ -927,7 +936,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;
 	}
-- 
cgit v1.2.3