]> code.delx.au - pulseaudio/commitdiff
protocol-native: Reinstate assert that was incorrectly removed
authorArun Raghavan <arun.raghavan@collabora.co.uk>
Mon, 19 Mar 2012 08:46:04 +0000 (14:16 +0530)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Mon, 19 Mar 2012 08:46:04 +0000 (14:16 +0530)
Commit 54cddc6ddf075b6248b0b8521120b2bd86049978 removed an assert that
looked redundant but was not. This commit reinstates it in a slightly
modified form. It is not stated as (a ^ b) instead of (!a || !b) in
order to make the condition more obvious.

src/pulsecore/protocol-native.c

index 34fff6e72be86624be49b955677aa8d4a369c776..9a437ffbfe56c61b52179ba82692e244b812cab9 100644 (file)
@@ -4699,6 +4699,7 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command,
     CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name_or_wildcard(name, command == PA_COMMAND_SET_SINK_PORT ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID);
     CHECK_VALIDITY(c->pstream, 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, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID);
     CHECK_VALIDITY(c->pstream, port, tag, PA_ERR_INVALID);
 
     if (command == PA_COMMAND_SET_SINK_PORT) {