diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-02-22 21:02:27 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-02-22 21:02:27 +0000 |
| commit | 708c650ad1366a0686d4c2b1932762205097081c (patch) | |
| tree | 07d97bb2bf69ee7168086da23b85e0f62c36b98a /src | |
| parent | bad8fd7cc0ab399786fb23cb39f824948947feba (diff) | |
enforce maximum memblockq length for clients
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@571 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
| -rw-r--r-- | src/polypcore/protocol-native.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c index 34d3a247..aba12036 100644 --- a/src/polypcore/protocol-native.c +++ b/src/polypcore/protocol-native.c @@ -59,6 +59,8 @@ /* Don't accept more connection than this */ #define MAX_CONNECTIONS 10 +#define MAX_MEMBLOCKQ_LENGTH (4*1024*1024) /* 4MB */ + struct connection; struct pa_protocol_native; @@ -238,8 +240,7 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_GET_AUTOLOAD_INFO] = command_get_autoload_info, [PA_COMMAND_GET_AUTOLOAD_INFO_LIST] = command_get_autoload_info_list, [PA_COMMAND_ADD_AUTOLOAD] = command_add_autoload, - [PA_COMMAND_REMOVE_AUTOLOAD] = command_remove_autoload, - + [PA_COMMAND_REMOVE_AUTOLOAD] = command_remove_autoload }; /* structure management */ @@ -721,6 +722,7 @@ static void command_create_playback_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GC CHECK_VALIDITY(c->pstream, name, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, sink_index != PA_INVALID_INDEX || !sink_name || *sink_name, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, map.channels == ss.channels && volume.channels == ss.channels, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, maxlength <= MAX_MEMBLOCKQ_LENGTH, tag, PA_ERR_INVALID); if (sink_index != PA_INVALID_INDEX) sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index); @@ -816,6 +818,7 @@ static void command_create_record_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_ CHECK_VALIDITY(c->pstream, name, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, source_index != PA_INVALID_INDEX || !source_name || *source_name, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, map.channels == ss.channels, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, maxlength <= MAX_MEMBLOCKQ_LENGTH, tag, PA_ERR_INVALID); if (source_index != PA_INVALID_INDEX) source = pa_idxset_get_by_index(c->protocol->core->sources, source_index); |