[vlc-commits] commit: Return fatal error to the upper layers when connection is lost while reading the ICY metadata . Otherwise we will end up with an endless loop since -1 is interpreted by AStreamRefillStream () as a temporary error. (Sven Petai )

git at videolan.org git at videolan.org
Sat Nov 13 19:41:33 CET 2010


vlc | branch: master | Sven Petai <hadara at bsd.ee> | Sat Nov  6 11:32:59 2010 +0200| [2a3e95d7b511fb627ac79a626068f4ba4271ad13] | committer: Rémi Denis-Courmont 

Return fatal error to the upper layers when connection is lost while reading the ICY metadata. Otherwise we will end up with an endless loop since -1 is interpreted by AStreamRefillStream() as a temporary error.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

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

diff --git a/modules/access/http.c b/modules/access/http.c
index e4ea721..5519af9 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -826,7 +826,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
             if( ReadICYMeta( p_access ) )
             {
                 p_access->info.b_eof = true;
-                return -1;
+                return 0;
             }
         }
         if( i_len > i_next )



More information about the vlc-commits mailing list