mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

raop: Fix potential NULL dereference

Browse source 
wath may be NULL, as suggested by Hajime Fujita
Coverity ID: #1398156

setting val = NULL is not needed

Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Hajime Fujita <crisp.fujita@nifty.com>
This commit is contained in:
Peter Meerwald-Stadler 2017-03-07 15:16:54 +01:00
parent a8ce3ef844
commit 4cfd544f21
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/raop/raop-client.c
View file

@ -1229,7 +1229,7 @@ static void rtsp_auth_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_st
const char *current = NULL;
char space[] = " ";
char *token, *ath = NULL;
char *publ, *wath, *mth, *val;
char *publ, *wath, *mth = NULL, *val;
char *realm = NULL, *nonce = NULL, *response = NULL;
char comma[] = ",";
@ -1244,19 +1244,18 @@ static void rtsp_auth_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_st
goto fail;
}
if (wath)
if (wath) {
mth = pa_split(wath, space, &current);
while ((token = pa_split(wath, comma, &current))) {
val = NULL;
if ((val = strstr(token, "="))) {
if (NULL == realm && val > strstr(token, "realm"))
realm = pa_xstrdup(val + 2);
else if (NULL == nonce && val > strstr(token, "nonce"))
nonce = pa_xstrdup(val + 2);
val = NULL;
}
while ((token = pa_split(wath, comma, &current))) {
if ((val = strstr(token, "="))) {
if (NULL == realm && val > strstr(token, "realm"))
realm = pa_xstrdup(val + 2);
else if (NULL == nonce && val > strstr(token, "nonce"))
nonce = pa_xstrdup(val + 2);
}
pa_xfree(token);
pa_xfree(token);
}
}
if (pa_safe_streq(mth, "Basic") && realm) {