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

httpd_output: assert that tag!=NULL

Browse Source 
In the tag() method, MPD guarantees that it does not pass tag==NULL.
Converted the runtime check to an assertion.
This commit is contained in:
Max Kellermann 2009-05-05 22:36:44 +02:00
parent 7dcdb2ce39
commit 795569208a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/output/httpd_output_plugin.c
View File

@ -378,16 +378,15 @@ httpd_output_tag(void *data, const struct tag *tag)
{ {
struct httpd_output *httpd = data; struct httpd_output *httpd = data;
if (httpd->metadata) { assert(tag != NULL);
page_unref (httpd->metadata);
httpd->metadata = NULL;
}
if (tag) if (httpd->metadata != NULL)
httpd->metadata = icy_server_metadata_page(tag, TAG_ITEM_ALBUM, page_unref (httpd->metadata);
TAG_ITEM_ARTIST,
TAG_ITEM_TITLE, httpd->metadata = icy_server_metadata_page(tag, TAG_ITEM_ALBUM,
TAG_NUM_OF_ITEM_TYPES); TAG_ITEM_ARTIST,
TAG_ITEM_TITLE,
TAG_NUM_OF_ITEM_TYPES);
if (httpd->metadata) { if (httpd->metadata) {
g_mutex_lock(httpd->mutex); g_mutex_lock(httpd->mutex);