[vlc-commits] net_Read: break potential dead lock with waitall = true

Rémi Denis-Courmont git at videolan.org
Wed Aug 14 20:30:41 CEST 2013


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 14 21:30:03 2013 +0300| [9311e60ac6c2d34fad5a613aef457a8b1824fb7c] | committer: Rémi Denis-Courmont

net_Read: break potential dead lock with waitall = true

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

 src/network/io.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/io.c b/src/network/io.c
index 21bf82b..740c990 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -314,7 +314,7 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
             p_buf = (char *)p_buf + n;
             i_buflen -= n;
 
-            if (!waitall)
+            if (!waitall || i_buflen == 0)
                 break;
         }
         else /* n == 0 */



More information about the vlc-commits mailing list