summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2011-08-10 19:08:22 +0000
committerRichard Mudgett <rmudgett@digium.com>2011-08-10 19:08:22 +0000
commitfa794d8f7a19cc77e75efab0144685436e5de0ec (patch)
treec999b84df7019a58f4ea466e031db520eb9f76d5 /main
parent02ecb12f64043fc73e05b71c4218c12fa8311e3e (diff)
Merged revisions 331420 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r331420 | rmudgett | 2011-08-10 14:07:53 -0500 (Wed, 10 Aug 2011) | 2 lines Make sure feature_request_and_dial() initializes outstate if passed in. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/features.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index d7463ebc4..8f16ffa1c 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3012,6 +3012,9 @@ static struct ast_channel *feature_request_and_dial(struct ast_channel *caller,
tmp_cap = ast_format_cap_alloc_nolock();
if (!tmp_cap) {
+ if (outstate) {
+ *outstate = 0;
+ }
return NULL;
}
ast_best_codec(cap, &best_audio_fmt);