From: Arun Raghavan Date: Tue, 12 Jul 2011 03:52:41 +0000 (-0700) Subject: protocol-native: Fix invalid assert X-Git-Tag: v0.99.1~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f69cbdbdf7a0416202f882be8a65793fa57783c6;p=platform%2Fupstream%2Fpulseaudio.git protocol-native: Fix invalid assert For source and sinks, we allow both the index and name to be invalid while introspecting (the default source/sink will be used). This modifies the assert appropriately. Thanks to Drew Ogle for reporting and providing a patch. --- diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index f26750d..0fa4f1a 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -3390,7 +3390,9 @@ static void command_get_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, p (command == PA_COMMAND_GET_SOURCE_INFO && pa_namereg_is_valid_name_or_wildcard(name, PA_NAMEREG_SOURCE)) || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, command == PA_COMMAND_GET_SINK_INFO || + command == PA_COMMAND_GET_SOURCE_INFO || + (idx != PA_INVALID_INDEX || name), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID);