[svn-commits] rmudgett: trunk r331421 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug 10 14:08:22 2011
New Revision: 331421

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331421
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=331421&r1=331420&r2=331421
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Aug 10 14:08:22 2011
@@ -3012,6 +3012,9 @@
 
 	tmp_cap = ast_format_cap_alloc_nolock();
 	if (!tmp_cap) {
+		if (outstate) {
+			*outstate = 0;
+		}
 		return NULL;
 	}
 	ast_best_codec(cap, &best_audio_fmt);