From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 30 Apr 2006 05:02:07 +0000 (+0000)
Subject: handle a memory allocation failure immediately so the following large block
X-Git-Tag: 1.4.0-beta1~1703
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed320702d9dc612a34103e691bfd333ac0486f12;p=thirdparty%2Fasterisk.git

handle a memory allocation failure immediately so the following large block
does not have to be indented


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

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index bb5be9f590..4afe0cee29 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -3995,13 +3995,11 @@ static void build_mapping(char *name, char *value)
 				break;
 		}
 		if (!map) {
-			map = ast_calloc(1, sizeof(*map));
-			if (map) {
-				AST_LIST_INSERT_HEAD(&mappings, map, list);
-				map->dead = 1;
-			}
+			if (!(map = ast_calloc(1, sizeof(*map))))
+				return;
+			AST_LIST_INSERT_HEAD(&mappings, map, list);
+			map->dead = 1;
 		}
-		if (map) {
 			map->options = 0;
 			memset(fields, 0, sizeof(fields));
 			x = 0;
@@ -4046,7 +4044,6 @@ static void build_mapping(char *name, char *value)
 				}
 			} else 
 				ast_log(LOG_WARNING, "Expected at least %d arguments in map, but got only %d\n", 4, x);
-		}
 	}
 }