From ef79c009913e48249829a1afda31b8c45e3e126d Mon Sep 17 00:00:00 2001 From: Kinsey Moore <kmoore@digium.com> Date: Wed, 27 Mar 2013 19:51:29 +0000 Subject: [PATCH] Address uninitialized conditional that valgrind found ........ Merged revisions 384162 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@384163 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- main/format_pref.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3b0a18d412..4054c6cff3 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -25355,7 +25355,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 4ab607e167..4ea9f0cc74 100644 --- 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); -- GitLab