mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a few more validity checks to protocol-esound

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@589 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-02-24 00:49:21 +00:00
parent 65736a2651
commit c2304d6872
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/polypcore/protocol-esound.c
View file

@ -260,6 +260,13 @@ static int format_native2esd(pa_sample_spec *ss) {
return format; return format;
} }
#define CHECK_VALIDITY(expression, string) do { \
if (!(expression)) { \
pa_log_warn(__FILE__ ": " string); \
return -1; \
} \
} while(0);
/*** esound commands ***/ /*** esound commands ***/
static int esd_proto_connect(struct connection *c, PA_GCC_UNUSED esd_proto_t request, const void *data, size_t length) { static int esd_proto_connect(struct connection *c, PA_GCC_UNUSED esd_proto_t request, const void *data, size_t length) {
@ -310,15 +317,9 @@ static int esd_proto_stream_play(struct connection *c, PA_GCC_UNUSED esd_proto_t
ss.rate = rate; ss.rate = rate;
format_esd2native(format, c->swap_byte_order, &ss); format_esd2native(format, c->swap_byte_order, &ss);
if (!pa_sample_spec_valid(&ss)) { CHECK_VALIDITY(pa_sample_spec_valid(&ss), "Invalid sample specification");
pa_log(__FILE__": invalid sample specification"); sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1);
return -1; CHECK_VALIDITY(sink, "No such sink");
}
if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
pa_log(__FILE__": no such sink");
return -1;
}
strncpy(name, (const char*) data + sizeof(int)*2, sizeof(name)); strncpy(name, (const char*) data + sizeof(int)*2, sizeof(name));
name[sizeof(name)-1] = 0; name[sizeof(name)-1] = 0;
@ -327,10 +328,9 @@ static int esd_proto_stream_play(struct connection *c, PA_GCC_UNUSED esd_proto_t
assert(!c->sink_input && !c->input_memblockq); assert(!c->sink_input && !c->input_memblockq);
if (!(c->sink_input = pa_sink_input_new(sink, __FILE__, name, &ss, NULL, 0, -1))) { c->sink_input = pa_sink_input_new(sink, __FILE__, name, &ss, NULL, 0, -1);
pa_log(__FILE__": failed to create sink input.");
return -1; CHECK_VALIDITY(c->sink_input, "Failed to create sink input.");
}
l = (size_t) (pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS); l = (size_t) (pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS);
c->input_memblockq = pa_memblockq_new( c->input_memblockq = pa_memblockq_new(
@ -374,10 +374,7 @@ static int esd_proto_stream_record(struct connection *c, esd_proto_t request, co
ss.rate = rate; ss.rate = rate;
format_esd2native(format, c->swap_byte_order, &ss); format_esd2native(format, c->swap_byte_order, &ss);
if (!pa_sample_spec_valid(&ss)) { CHECK_VALIDITY(pa_sample_spec_valid(&ss), "Invalid sample specification.");
pa_log(__FILE__": invalid sample specification.");
return -1;
}
if (request == ESD_PROTO_STREAM_MON) { if (request == ESD_PROTO_STREAM_MON) {
pa_sink* sink; pa_sink* sink;
@ -631,10 +628,11 @@ static int esd_proto_sample_cache(struct connection *c, PA_GCC_UNUSED esd_proto_
ss.rate = rate; ss.rate = rate;
format_esd2native(format, c->swap_byte_order, &ss); format_esd2native(format, c->swap_byte_order, &ss);
CHECK_VALIDITY(pa_sample_spec_valid(&ss), "Invalid sample specification.");
sc_length = (size_t) MAYBE_INT32_SWAP(c->swap_byte_order, (*((const int*)data + 2))); sc_length = (size_t) MAYBE_INT32_SWAP(c->swap_byte_order, (*((const int*)data + 2)));
if (sc_length >= MAX_CACHE_SAMPLE_SIZE) CHECK_VALIDITY(sc_length <= MAX_CACHE_SAMPLE_SIZE, "Sample too large.");
return -1;
strcpy(name, SCACHE_PREFIX); strcpy(name, SCACHE_PREFIX);
strncpy(name+sizeof(SCACHE_PREFIX)-1, (const char*) data+3*sizeof(int), ESD_NAME_MAX); strncpy(name+sizeof(SCACHE_PREFIX)-1, (const char*) data+3*sizeof(int), ESD_NAME_MAX);
@ -792,7 +790,7 @@ static int do_read(struct connection *c) {
return -1; return -1;
} }
if ((c->read_data_length+= r) >= handler->data_length) { if ((c->read_data_length += r) >= handler->data_length) {
size_t l = c->read_data_length; size_t l = c->read_data_length;
assert(handler->proc); assert(handler->proc);
@ -1077,7 +1075,7 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata)
return; return;
} }
c = pa_xmalloc(sizeof(struct connection)); c = pa_xnew(struct connection, 1);
c->protocol = p; c->protocol = p;
c->io = io; c->io = io;
pa_iochannel_set_callback(c->io, io_callback, c); pa_iochannel_set_callback(c->io, io_callback, c);
@ -1139,7 +1137,7 @@ pa_protocol_esound* pa_protocol_esound_new(pa_core*core, pa_socket_server *serve
int public = 0; int public = 0;
assert(core && server && ma); assert(core && server && ma);
p = pa_xmalloc(sizeof(pa_protocol_esound)); p = pa_xnew(pa_protocol_esound, 1);
if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) { if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
pa_log(__FILE__": public= expects a boolean argument."); pa_log(__FILE__": public= expects a boolean argument.");