From 4d7922d0910c2f34b4d172ce6c2bb54089d8cf3a Mon Sep 17 00:00:00 2001 From: Peter Meerwald-Stadler Date: Wed, 22 Feb 2017 15:21:00 +0100 Subject: [PATCH] raop: Fix resource leaks Coverity ID: #1398158, #1398159 Signed-off-by: Peter Meerwald-Stadler --- src/modules/raop/raop-client.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/modules/raop/raop-client.c b/src/modules/raop/raop-client.c index 70340943c..dfa0f8592 100644 --- a/src/modules/raop/raop-client.c +++ b/src/modules/raop/raop-client.c @@ -1228,7 +1228,7 @@ static void rtsp_auth_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_st static bool waiting = false; const char *current = NULL; char space[] = " "; - char *token,*ath = NULL; + char *token, *ath = NULL; char *publ, *wath, *mth, *val; char *realm = NULL, *nonce = NULL, *response = NULL; char comma[] = ","; @@ -1265,9 +1265,6 @@ static void rtsp_auth_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_st pa_raop_basic_response(DEFAULT_USER_NAME, c->password, &response); ath = pa_sprintf_malloc("Basic %s", response); - - pa_xfree(response); - pa_xfree(realm); } else if (pa_safe_streq(mth, "Digest")) { rtrim_char(realm, '\"'); rtrim_char(nonce, '\"'); @@ -1276,17 +1273,18 @@ static void rtsp_auth_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_st ath = pa_sprintf_malloc("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"*\", response=\"%s\"", DEFAULT_USER_NAME, realm, nonce, response); - - pa_xfree(response); - pa_xfree(realm); - pa_xfree(nonce); } else { pa_log_error("unsupported authentication method: %s", mth); + pa_xfree(realm); + pa_xfree(nonce); pa_xfree(wath); pa_xfree(mth); goto error; } + pa_xfree(response); + pa_xfree(realm); + pa_xfree(nonce); pa_xfree(wath); pa_xfree(mth);