# HG changeset patch
# User mf0102 <0102@gmx.at>
# Date 1199889719 -3600
# Node ID 72f340bb5ea38d5c80a7398f7245dda470a001d3
# Parent  d19b53359b24f4f422978f120cc0eb1b1e0459d8# Parent  689bdfacb10cc571b2880d333320511c16390300
automated branch merge

diff -r d19b53359b24 -r 72f340bb5ea3 src/scrobbler/scrobbler.c
--- a/src/scrobbler/scrobbler.c	Wed Jan 09 15:41:22 2008 +0100
+++ b/src/scrobbler/scrobbler.c	Wed Jan 09 15:41:59 2008 +0100
@@ -673,12 +673,18 @@
 	curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 	/*cfa(&post, &last, "debug", "failed");*/
 
+        char *field_artist = fmt_escape(aud_tuple_get_string(tuple, FIELD_ARTIST, NULL));
+        char *field_title = fmt_escape(aud_tuple_get_string(tuple, FIELD_TITLE, NULL));
+        char *field_album = aud_tuple_get_string(tuple, FIELD_ALBUM, NULL) ? fmt_escape(aud_tuple_get_string(tuple, FIELD_ALBUM, NULL)) : fmt_escape("");
 	entry = g_strdup_printf("s=%s&a=%s&t=%s&b=%s&l=%d&n=%d&m=", sc_session_id,
-		fmt_escape(aud_tuple_get_string(tuple, FIELD_ARTIST, NULL)),
-		fmt_escape(aud_tuple_get_string(tuple, FIELD_TITLE, NULL)),
-		aud_tuple_get_string(tuple, FIELD_ALBUM, NULL) ? fmt_escape(aud_tuple_get_string(tuple, FIELD_ALBUM, NULL)) : "",
+		field_artist,
+		field_title,
+		field_album,
 		aud_tuple_get_int(tuple, FIELD_LENGTH, NULL) / 1000,
 		aud_tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL));
+        curl_free(field_artist);
+        curl_free(field_title);
+        curl_free(field_album);
 
 	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char *) entry);
 	memset(sc_curl_errbuf, 0, sizeof(sc_curl_errbuf));
@@ -741,6 +747,7 @@
 	status = curl_easy_perform(curl);
 
 	curl_easy_cleanup(curl);
+        g_string_free(submission, TRUE);
 
 	if (status) {
 		pdebug(sc_curl_errbuf, DEBUG);