src/pulsecore/protocol-native.c | 1 +
1 file changed, 1 insertion(+)
New commits:
commit fd637e87657ab944f28de422564bca71f9be579b
Author: Arun Raghavan <[email protected]>
Date: Mon Mar 19 14:16:04 2012 +0530
protocol-native: Reinstate assert that was incorrectly removed
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.
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 34fff6e..9a437ff 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -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) {
_______________________________________________
pulseaudio-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
