diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-04-22 05:45:20 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-04-22 05:45:20 -0500 |
| commit | edd9e54818b6d7cdedcdd7aa835cb132852ca891 (patch) | |
| tree | 17a7de0c74966b3ba45ef0bd591df7c29a8b5bdd | |
| parent | 4423d5f755afb3aa87c032bd4d3243f6078d29ec (diff) | |
| parent | ad1a118632098a5d2d746d157f4c6f3d15694f65 (diff) | |
Merge "Check for ao2_alloc failure in __ast_channel_internal_alloc." into 13
| -rw-r--r-- | main/channel_internal_api.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c index 624bdd1cb..835b9ce37 100644 --- a/main/channel_internal_api.c +++ b/main/channel_internal_api.c @@ -1457,6 +1457,10 @@ struct ast_channel *__ast_channel_internal_alloc(void (*destructor)(void *obj), tmp = ao2_alloc(sizeof(*tmp), destructor); #endif + if (!tmp) { + return NULL; + } + if ((ast_string_field_init(tmp, 128))) { return ast_channel_unref(tmp); } |