Merged revisions 331420 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Wed, 10 Aug 2011 19:08:22 +0000 (19:08 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 10 Aug 2011 19:08:22 +0000 (19:08 +0000)
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

main/features.c

index d7463eb..8f16ffa 100644 (file)
@@ -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);