test if sink->monitor_source is set before making use of it

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1228 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index eecf68fffaa3b5b495ecb5df2eaa141d5a4320b0..a1a2e56477b17489037ae550ac9f52821afb06ed 100644 (file)
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -109,7 +109,7 @@ char *pa_sink_list_to_string(pa_core *c) {
             sink->driver,
             pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink, PA_MIXER_HARDWARE)),
             (double) pa_sink_get_latency(sink),
-            sink->monitor_source->index,
+            sink->monitor_source ? sink->monitor_source->index : PA_INVALID_INDEX,
             pa_sample_spec_snprint(ss, sizeof(ss), &sink->sample_spec),
             pa_channel_map_snprint(cm, sizeof(cm), &sink->channel_map));
 

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index d5a4cf45948bf23bc65cbb2afe617bf03e823c80..982129228fa59d0cb8967db5625de32a4a24571d 100644 (file)
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -1276,8 +1276,8 @@ static void sink_fill_tagstruct(pa_tagstruct *t, pa_sink *sink) {
         PA_TAG_U32, sink->owner ? sink->owner->index : PA_INVALID_INDEX,
         PA_TAG_CVOLUME, pa_sink_get_volume(sink, PA_MIXER_HARDWARE),
         PA_TAG_BOOLEAN, pa_sink_get_mute(sink, PA_MIXER_HARDWARE),
-        PA_TAG_U32, sink->monitor_source->index,
-        PA_TAG_STRING, sink->monitor_source->name,
+        PA_TAG_U32, sink->monitor_source ? sink->monitor_source->index : PA_INVALID_INDEX,
+        PA_TAG_STRING, sink->monitor_source ? sink->monitor_source->name : NULL,
         PA_TAG_USEC, pa_sink_get_latency(sink),
         PA_TAG_STRING, sink->driver,
         PA_TAG_U32,