[pulseaudio-commits] r1499 - /branches/lennart/src/pulsecore/protocol-simple.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Jun 26 00:33:04 2007
New Revision: 1499

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1499&root=3Dpulseaudio&vi=
ew=3Drev
Log:
make sure we don't free the same connection twice

Modified:
    branches/lennart/src/pulsecore/protocol-simple.c

Modified: branches/lennart/src/pulsecore/protocol-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
protocol-simple.c?rev=3D1499&root=3Dpulseaudio&r1=3D1498&r2=3D1499&view=3Dd=
iff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/protocol-simple.c (original)
+++ branches/lennart/src/pulsecore/protocol-simple.c Tue Jun 26 00:33:04 20=
07
@@ -123,7 +123,8 @@
 static void connection_drop(connection *c) {
     pa_assert(c);
     =

-    pa_assert_se(pa_idxset_remove_by_data(c->protocol->connections, c, NUL=
L) =3D=3D c);
+    if (!pa_idxset_remove_by_data(c->protocol->connections, c, NULL))
+        return;
 =

     if (c->sink_input) {
         pa_sink_input_disconnect(c->sink_input);