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

raop: Fix memleak

Browse source 
use local scope for trs variable simplifying cleanup
Coverity ID: #1398160

Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald-Stadler 2017-02-22 15:09:02 +01:00
parent 95d850a5ad
commit 4bb25292f8
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -988,14 +988,13 @@ static void rtsp_stream_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_
pa_socket_client *sc = NULL; pa_socket_client *sc = NULL;
uint32_t sport = DEFAULT_UDP_AUDIO_PORT; uint32_t sport = DEFAULT_UDP_AUDIO_PORT;
uint32_t cport =0, tport = 0; uint32_t cport =0, tport = 0;
char *ajs, *trs, *token, *pc; char *ajs, *token, *pc;
const char *token_state = NULL; const char *token_state = NULL;
char delimiters[] = ";"; char delimiters[] = ";";
pa_log_debug("RAOP: SETUP"); pa_log_debug("RAOP: SETUP");
ajs = pa_xstrdup(pa_headerlist_gets(headers, "Audio-Jack-Status")); ajs = pa_xstrdup(pa_headerlist_gets(headers, "Audio-Jack-Status"));
trs = pa_xstrdup(pa_headerlist_gets(headers, "Transport"));
if (ajs) { if (ajs) {
c->jack_type = JACK_TYPE_ANALOG; c->jack_type = JACK_TYPE_ANALOG;
@ -1032,6 +1031,8 @@ static void rtsp_stream_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_
pa_socket_client_unref(sc); pa_socket_client_unref(sc);
sc = NULL; sc = NULL;
} else if (c->protocol == PA_RAOP_PROTOCOL_UDP) { } else if (c->protocol == PA_RAOP_PROTOCOL_UDP) {
char *trs = pa_xstrdup(pa_headerlist_gets(headers, "Transport"));
if (trs) { if (trs) {
/* Now parse out the server port component of the response. */ /* Now parse out the server port component of the response. */
while ((token = pa_split(trs, delimiters, &token_state))) { while ((token = pa_split(trs, delimiters, &token_state))) {
@ -1045,6 +1046,7 @@ static void rtsp_stream_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_
} }
pa_xfree(token); pa_xfree(token);
} }
pa_xfree(trs);
} else { } else {
pa_log_warn("\"Transport\" missing in RTSP setup response"); pa_log_warn("\"Transport\" missing in RTSP setup response");
} }
@ -1067,7 +1069,6 @@ static void rtsp_stream_cb(pa_rtsp_client *rtsp, pa_rtsp_state_t state, pa_rtsp_
pa_rtsp_record(c->rtsp, &c->seq, &c->rtptime); pa_rtsp_record(c->rtsp, &c->seq, &c->rtptime);
pa_xfree(trs);
pa_xfree(ajs); pa_xfree(ajs);
break; break;