[vlc-devel] commit: Avoid infinite loop when the telnet session is closed client-side. ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Feb 25 17:31:39 CET 2009


vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Feb 25 18:31:21 2009 +0200| [94d47acb83e4546ec3580afc8da62a9ba5e86cb7] | committer: Rémi Denis-Courmont 

Avoid infinite loop when the telnet session is closed client-side.

Signed-off-by: Rémi Denis-Courmont <rdenis at simphalempin.com>
(cherry picked from commit 51d3696e9db7df2a1cabade28f058d8183b6d1ed)

Conflicts:

	modules/control/telnet.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=94d47acb83e4546ec3580afc8da62a9ba5e86cb7
---

 modules/control/telnet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index 643defd..f7ce883 100644
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -382,7 +382,7 @@ static void Run( intf_thread_t *p_intf )
                 }
 #endif
 
-                if (i_recv <= 0 && ( end || errno != EAGAIN ) )
+                if( i_recv == 0 || ( i_recv == -1 && ( end || errno != EAGAIN ) ) )
                     goto drop;
             }
         }




More information about the vlc-devel mailing list