summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-04-01 03:03:20 +0200
committerLennart Poettering <lennart@poettering.net>2009-04-01 03:03:20 +0200
commitc2f6d090c795bba9ef405908cee06bba79a87f1f (patch)
tree40bea0d66227b831ffe3018755886be37d4d972d
parentd9b19f870c4803aea7d6fc7f7bfc93f78b097435 (diff)
don't access i->sink if it is not set
-rw-r--r--src/pulsecore/sink-input.c8
-rw-r--r--src/pulsecore/source-output.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index da422428..537f198d 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -845,10 +845,12 @@ pa_usec_t pa_sink_input_set_requested_latency(pa_sink_input *i, pa_usec_t usec)
/* If this sink input is not realized yet or we are being moved,
* we have to touch the thread info data directly */
- pa_sink_get_latency_range(i->sink, &min_latency, &max_latency);
+ if (i->sink) {
+ pa_sink_get_latency_range(i->sink, &min_latency, &max_latency);
- if (usec != (pa_usec_t) -1)
- usec = PA_CLAMP(usec, min_latency, max_latency);
+ if (usec != (pa_usec_t) -1)
+ usec = PA_CLAMP(usec, min_latency, max_latency);
+ }
i->thread_info.requested_sink_latency = usec;
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 550b6571..5c240063 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -542,10 +542,12 @@ pa_usec_t pa_source_output_set_requested_latency(pa_source_output *o, pa_usec_t
/* If this source output is not realized yet or is being moved, we
* have to touch the thread info data directly */
- pa_source_get_latency_range(o->source, &min_latency, &max_latency);
+ if (o->source) {
+ pa_source_get_latency_range(o->source, &min_latency, &max_latency);
- if (usec != (pa_usec_t) -1)
- usec = PA_CLAMP(usec, min_latency, max_latency);
+ if (usec != (pa_usec_t) -1)
+ usec = PA_CLAMP(usec, min_latency, max_latency);
+ }
o->thread_info.requested_source_latency = usec;