2 files changed, 9 insertions, 1 deletions

diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c b/src/conversation/gnunet-helper-audio-playback-gst.c
index 48f0c5b48..f1e1e773d 100644
--- a/src/conversation/gnunet-helper-audio-playback-gst.c
+++ b/src/conversation/gnunet-helper-audio-playback-gst.c
@@ -180,7 +180,7 @@ feed_buffer_to_gst (const char *audio, size_t b_len)
               "Feeding %u bytes to GStreamer\n",
               (unsigned int) b_len);
 
-  bufspace = g_memdup (audio, b_len);
+  bufspace = g_memdup2 (audio, b_len);
   b = gst_buffer_new_wrapped (bufspace, b_len);
   if (NULL == b)
   {
diff --git a/src/conversation/test_conversation.conf b/src/conversation/test_conversation.conf
index e77b41003..a2f768713 100644
--- a/src/conversation/test_conversation.conf
+++ b/src/conversation/test_conversation.conf
@@ -4,5 +4,13 @@
 LINE=1
 #PREFIX = valgrind
 
+[zonemaster-monitor]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+
+[zonemaster]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+
 [nse]
 WORKBITS = 0