diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-04-30 05:02:07 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-04-30 05:02:07 +0000 |
commit | ed320702d9dc612a34103e691bfd333ac0486f12 (patch) | |
tree | cec2b9b8ea9dae77557fd7191d33439762f5d2c2 /pbx/pbx_dundi.c | |
parent | 4cfcacf6c9bdd684d8cea7a72a6b12f81c8a9ff3 (diff) |
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
Diffstat (limited to 'pbx/pbx_dundi.c')
-rw-r--r-- | pbx/pbx_dundi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index bb5be9f59..4afe0cee2 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); - } } } |