[asterisk-commits] kmoore: trunk r384164 - in /trunk: ./ channels/chan_sip.c main/format_pref.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Mar 27 14:52:19 2013
New Revision: 384164

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384164
Log:
Address uninitialized conditional that valgrind found
........

Merged revisions 384162 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 384163 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c
    trunk/main/format_pref.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=384164&r1=384163&r2=384164
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Mar 27 14:52:19 2013
@@ -25683,7 +25683,7 @@
 
 	/* Session-Timers */
 	if ((p->sipoptions & SIP_OPT_TIMER)) {
-		enum st_refresher_param st_ref_param;
+		enum st_refresher_param st_ref_param = SESSION_TIMER_REFRESHER_PARAM_UNKNOWN;
 
 		/* The UAC has requested session-timers for this session. Negotiate
 		the session refresh interval and who will be the refresher */

Modified: trunk/main/format_pref.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format_pref.c?view=diff&rev=384164&r1=384163&r2=384164
==============================================================================
--- trunk/main/format_pref.c (original)
+++ trunk/main/format_pref.c Wed Mar 27 14:52:19 2013
@@ -317,7 +317,7 @@
 /*! \brief Pick a codec */
 struct ast_format *ast_codec_choose(struct ast_codec_pref *pref, struct ast_format_cap *cap, int find_best, struct ast_format *result)
 {
-	int x, slot, found;
+	int x, slot, found = 0;
 	size_t f_len = 0;
 	const struct ast_format_list *f_list = ast_format_list_get(&f_len);