]> code.delx.au - pulseaudio/commitdiff
protocol-native: Fix invalid assert
authorArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 12 Jul 2011 03:52:41 +0000 (20:52 -0700)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 12 Jul 2011 03:52:41 +0000 (20:52 -0700)
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
<dantealiegri@gmail.com> for reporting and providing a patch.

src/pulsecore/protocol-native.c

index f26750de7d76f07e159d8208790e54327edee19d..0fa4f1ad362b72a7faac5af366a9b2e2ebc521bc 100644 (file)
@@ -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);