summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-07-05 18:29:28 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-07-05 18:29:28 -0500
commitcad74cdd8f2bc3c23c6fd9aa6121ed009334786f (patch)
tree903bcc3993d595a73e111cbfc04e2de78c89d340
parentdc1fc28a4a6e5af660fc8893edf0dfdfb760205f (diff)
parent6258de458b2e6ba02e91ed67bbd2801f0984526a (diff)
Merge "core: Fix segfault when invoking 'data get' CLI command" into 13
-rw-r--r--main/data.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/data.c b/main/data.c
index 33a7c040f..59729492c 100644
--- a/main/data.c
+++ b/main/data.c
@@ -3145,6 +3145,10 @@ int ast_data_add_codecs(struct ast_data *root, const char *node_name, struct ast
return -1;
}
+ if (!cap) {
+ return 0;
+ }
+
count = ast_format_cap_count(cap);
for (i = 0; i < count; ++i) {
struct ast_format *fmt;