]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
handle a memory allocation failure immediately so the following large block
authorRussell Bryant <russell@russellbryant.com>
Sun, 30 Apr 2006 05:02:07 +0000 (05:02 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sun, 30 Apr 2006 05:02:07 +0000 (05:02 +0000)
does not have to be indented

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

pbx/pbx_dundi.c

index bb5be9f59007a7d4aa118130c32d58422064eb70..4afe0cee29fc81fb298a0fd7bcf43117270abe14 100644 (file)
@@ -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);
-               }
        }
 }