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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384164 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index eb26020f3b0bd9af9c410af7d4adc41ee549798a..200d25c6c2fbea4ed8f82880cb98cd8c67207c50 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -25683,7 +25683,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str
 
        /* 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 */

diff --git a/main/format_pref.c b/main/format_pref.c
index 4ab607e167803e66ae8e8edf2bf8d324d6a3a8da..4ea9f0cc74198f109394aaac9cb2d789be1d2315 100644 (file)
--- a/main/format_pref.c
+++ b/main/format_pref.c
@@ -317,7 +317,7 @@ struct ast_format_list ast_codec_pref_getsize(struct ast_codec_pref *pref, struc
 /*! \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);