oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/soundcloud: eliminate nullptr checks before g_free()

Browse Source
This commit is contained in:
Max Kellermann 2014-01-07 09:27:50 +01:00
parent bd01d80ffc
commit da9dd58f34
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/playlist/SoundCloudPlaylistPlugin.cxx
View File

@ -146,13 +146,11 @@ handle_string(void *ctx, const unsigned char* stringval,
switch (data->key) { switch (data->key) {
case Title: case Title:
if (data->title != nullptr) g_free(data->title);
g_free(data->title);
data->title = g_strndup(s, stringlen); data->title = g_strndup(s, stringlen);
break; break;
case Stream_URL: case Stream_URL:
if (data->stream_url != nullptr) g_free(data->stream_url);
g_free(data->stream_url);
data->stream_url = g_strndup(s, stringlen); data->stream_url = g_strndup(s, stringlen);
data->got_url = 1; data->got_url = 1;
break; break;
@ -399,10 +397,8 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
g_free(u); g_free(u);
yajl_free(hand); yajl_free(hand);
if (data.title != nullptr) g_free(data.title);
g_free(data.title); g_free(data.stream_url);
if (data.stream_url != nullptr)
g_free(data.stream_url);
if (ret == -1) if (ret == -1)
return nullptr; return nullptr;