]> code.delx.au - pulseaudio/commitdiff
padsp: Handle eol in info callbacks correctly
authorArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 12 Jul 2011 03:59:30 +0000 (20:59 -0700)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 12 Jul 2011 03:59:30 +0000 (20:59 -0700)
When receiving an eol, the object will be NULL and we're not handling
this correctly. Thanks to Drew Ogle <dantealiegri@gmail.com> for
reporting this and providing a patch.

src/utils/padsp.c

index ab9d18a34c6bd4c0804360a1e8a66195c4c37924..2468d06fb0beed983f516f714f0e015d0b3ccb72 100644 (file)
@@ -1222,7 +1222,7 @@ fail:
 static void sink_info_cb(pa_context *context, const pa_sink_info *si, int eol, void *userdata) {
     fd_info *i = userdata;
 
-    if (!si || eol < 0) {
+    if (eol < 0) {
         i->operation_success = 0;
         pa_threaded_mainloop_signal(i->mainloop, 0);
         return;
@@ -1244,7 +1244,7 @@ static void sink_info_cb(pa_context *context, const pa_sink_info *si, int eol, v
 static void source_info_cb(pa_context *context, const pa_source_info *si, int eol, void *userdata) {
     fd_info *i = userdata;
 
-    if (!si || eol < 0) {
+    if (eol < 0) {
         i->operation_success = 0;
         pa_threaded_mainloop_signal(i->mainloop, 0);
         return;