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

playlist/SoundCloud: use AtScopeExit()

Browse Source
This commit is contained in:
Max Kellermann 2016-09-09 17:56:51 +02:00
parent 2f03d2234a
commit 20894d1c5e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
View File

@ -28,6 +28,7 @@
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/ScopeExit.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <yajl/yajl_parse.h> #include <yajl/yajl_parse.h>
@ -317,6 +318,8 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
u = soundcloud_resolve(rest); u = soundcloud_resolve(rest);
} }
AtScopeExit(u) { free(u); };
if (u == nullptr) { if (u == nullptr) {
LogWarning(soundcloud_domain, "unknown soundcloud URI"); LogWarning(soundcloud_domain, "unknown soundcloud URI");
return nullptr; return nullptr;
@ -324,12 +327,10 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
SoundCloudJsonData data; SoundCloudJsonData data;
yajl_handle hand = yajl_alloc(&parse_callbacks, nullptr, &data); yajl_handle hand = yajl_alloc(&parse_callbacks, nullptr, &data);
AtScopeExit(hand, &data) { yajl_free(hand); };
int ret = soundcloud_parse_json(u, hand, mutex, cond); int ret = soundcloud_parse_json(u, hand, mutex, cond);
free(u);
yajl_free(hand);
if (ret == -1) if (ret == -1)
return nullptr; return nullptr;