[libdmapsharing] Fix segfault in test-dmap-server; there still seems to be another Signed-off-by: W. Michael Petullo



commit cd9715910023543668be0ba42172720cc3ef124f
Author: W. Michael Petullo <mike flyn org>
Date:   Fri Jan 28 16:08:31 2011 -0600

    Fix segfault in test-dmap-server; there still seems to be another
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/daap-share.c    |    1 +
 tests/test-dmap-container-db.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 1da3837..ebadef6 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -585,6 +585,7 @@ add_entry_to_mlcl (gpointer id,
 	if (_dmap_share_client_requested (mb->bits, SONG_FORMAT)) {
 		gchar *format = NULL;
 		gchar *transcode_mimetype = NULL;
+		/* FIXME: This should be share, not record: */
 		g_object_get (record, "transcode-mimetype", &transcode_mimetype, NULL);
 		if (transcode_mimetype)
 			format = g_strdup (mime_to_format (transcode_mimetype));
diff --git a/tests/test-dmap-container-db.c b/tests/test-dmap-container-db.c
index 2977f29..2820a65 100644
--- a/tests/test-dmap-container-db.c
+++ b/tests/test-dmap-container-db.c
@@ -39,7 +39,7 @@ test_dmap_container_db_foreach (DMAPContainerDb *db,
 				gpointer data)
 {
 	/* In reality, pull each record from the db and execute func on it. */
-        func (record, data, NULL);
+        func (GUINT_TO_POINTER (1), record, data);
 }
 
 static gint64



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]