diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-09-21 08:08:28 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-09-21 08:08:29 -0500 |
| commit | 960f00939aeb369891727b83c5b35c309611185f (patch) | |
| tree | 3d835ca7b39b6b1557d904411cc334c1aee86fa5 /main | |
| parent | efbd0f5a9758bb1d8dbfde397553f83058453f97 (diff) | |
| parent | 4eedd9ef9d7c000cd8d67cbeb1789ac6d71860aa (diff) | |
Merge "main/config_options: Check for existance of internal object before derefing" into 13
Diffstat (limited to 'main')
| -rw-r--r-- | main/config_options.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/config_options.c b/main/config_options.c index 0cc2dda3e..0c706ac53 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -837,6 +837,10 @@ int aco_set_defaults(struct aco_type *type, const char *category, void *obj) struct aco_option *opt; struct ao2_iterator iter; + if (!type->internal) { + return -1; + } + iter = ao2_iterator_init(type->internal->opts, 0); while ((opt = ao2_iterator_next(&iter))) { |