diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-01-12 03:01:14 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-02-09 22:30:20 +0000 |
| commit | 7ab9bea29dc9b3174be6b6a3a557c934b8265533 (patch) | |
| tree | 3cf2c9fed37bf07e214bb70d7c3d12035c54b1ba | |
| parent | e8a2d127249dfb255efd03f7eebbbbe5502e5951 (diff) | |
client: detect forking in sample cache API, too
| -rw-r--r-- | src/pulse/scache.c | 9 | ||||
| -rw-r--r-- | src/pulse/stream.c | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/pulse/scache.c b/src/pulse/scache.c index 27da6887..2a7602fd 100644 --- a/src/pulse/scache.c +++ b/src/pulse/scache.c @@ -28,15 +28,15 @@ #include <string.h> #include <pulse/utf8.h> +#include <pulse/scache.h> #include <pulsecore/pstream-util.h> #include <pulsecore/macro.h> #include <pulsecore/proplist-util.h> +#include "fork-detect.h" #include "internal.h" -#include "scache.h" - int pa_stream_connect_upload(pa_stream *s, size_t length) { pa_tagstruct *t; uint32_t tag; @@ -45,6 +45,7 @@ int pa_stream_connect_upload(pa_stream *s, size_t length) { pa_assert(s); pa_assert(PA_REFCNT_VALUE(s) >= 1); + PA_CHECK_VALIDITY(s->context, !pa_detect_fork(), PA_ERR_FORKED); PA_CHECK_VALIDITY(s->context, s->state == PA_STREAM_UNCONNECTED, PA_ERR_BADSTATE); PA_CHECK_VALIDITY(s->context, length > 0, PA_ERR_INVALID); PA_CHECK_VALIDITY(s->context, length == (size_t) (uint32_t) length, PA_ERR_INVALID); @@ -85,6 +86,7 @@ int pa_stream_finish_upload(pa_stream *s) { pa_assert(s); pa_assert(PA_REFCNT_VALUE(s) >= 1); + PA_CHECK_VALIDITY(s->context, !pa_detect_fork(), PA_ERR_FORKED); PA_CHECK_VALIDITY(s->context, s->channel_valid, PA_ERR_BADSTATE); PA_CHECK_VALIDITY(s->context, s->context->state == PA_CONTEXT_READY, PA_ERR_BADSTATE); @@ -174,6 +176,7 @@ pa_operation *pa_context_play_sample(pa_context *c, const char *name, const char pa_assert(c); pa_assert(PA_REFCNT_VALUE(c) >= 1); + PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED); PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID); PA_CHECK_VALIDITY_RETURN_NULL(c, !dev || *dev, PA_ERR_INVALID); @@ -213,6 +216,7 @@ pa_operation *pa_context_play_sample_with_proplist(pa_context *c, const char *na pa_assert(c); pa_assert(PA_REFCNT_VALUE(c) >= 1); + PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED); PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID); PA_CHECK_VALIDITY_RETURN_NULL(c, !dev || *dev, PA_ERR_INVALID); @@ -255,6 +259,7 @@ pa_operation* pa_context_remove_sample(pa_context *c, const char *name, pa_conte pa_assert(c); pa_assert(PA_REFCNT_VALUE(c) >= 1); + PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED); PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID); diff --git a/src/pulse/stream.c b/src/pulse/stream.c index 0f9e50ab..a4f34d9a 100644 --- a/src/pulse/stream.c +++ b/src/pulse/stream.c @@ -29,6 +29,7 @@ #include <string.h> #include <pulse/def.h> +#include <pulse/stream.h> #include <pulse/timeval.h> #include <pulse/rtclock.h> #include <pulse/xmalloc.h> |