diff options
| author | Corey Farrell <git@cfware.com> | 2014-03-27 19:21:44 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2014-03-27 19:21:44 +0000 |
| commit | fbe0dfaf4410a4ed34cca248d0885ea87c747e27 (patch) | |
| tree | b8adead7bbb0c61a5b1873c5432dd0359af50047 /main/features_config.c | |
| parent | 44409401ec7d754a2af861f599e88e5199c2ccf0 (diff) | |
Fix dialplan function NULL channel safety issues
(closes issue ASTERISK-23391)
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/3386/
........
Merged revisions 411313 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 411314 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 411315 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features_config.c')
| -rw-r--r-- | main/features_config.c | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/main/features_config.c b/main/features_config.c index 3d2ded576..d58886eec 100644 --- a/main/features_config.c +++ b/main/features_config.c @@ -1535,7 +1535,7 @@ static int features_pre_apply_config(void) return err; } -static int feature_read(struct ast_channel *chan, const char *cmd, char *data, +static int internal_feature_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { int res; @@ -1566,7 +1566,7 @@ static int feature_read(struct ast_channel *chan, const char *cmd, char *data, return res; } -static int feature_write(struct ast_channel *chan, const char *cmd, char *data, +static int internal_feature_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { int res; @@ -1596,7 +1596,7 @@ static int feature_write(struct ast_channel *chan, const char *cmd, char *data, return res; } -static int featuremap_read(struct ast_channel *chan, const char *cmd, char *data, +static int internal_featuremap_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { int res; @@ -1611,7 +1611,7 @@ static int featuremap_read(struct ast_channel *chan, const char *cmd, char *data return res; } -static int featuremap_write(struct ast_channel *chan, const char *cmd, char *data, +static int internal_featuremap_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { int res; @@ -1631,6 +1631,50 @@ static int featuremap_write(struct ast_channel *chan, const char *cmd, char *dat return 0; } +static int feature_read(struct ast_channel *chan, const char *cmd, char *data, + char *buf, size_t len) +{ + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + + return internal_feature_read(chan, cmd, data, buf, len); +} + +static int feature_write(struct ast_channel *chan, const char *cmd, char *data, + const char *value) +{ + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + + return internal_feature_write(chan, cmd, data, value); +} + +static int featuremap_read(struct ast_channel *chan, const char *cmd, char *data, + char *buf, size_t len) +{ + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + + return internal_featuremap_read(chan, cmd, data, buf, len); +} + +static int featuremap_write(struct ast_channel *chan, const char *cmd, char *data, + const char *value) +{ + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + + return internal_featuremap_write(chan, cmd, data, value); +} + static struct ast_custom_function feature_function = { .name = "FEATURE", .read = feature_read, |