]> git.sesse.net Git - vlc/commitdiff
http: fix memory leak in the error path
authorRémi Duraffort <ivoire@videolan.org>
Sun, 4 Mar 2012 18:25:32 +0000 (19:25 +0100)
committerRémi Duraffort <ivoire@videolan.org>
Sun, 4 Mar 2012 18:25:32 +0000 (19:25 +0100)
modules/access/http.c

index cc1ec8227d596063a256430e1372bad58f59c5ed..a292ebb9fd51748563cc1ac68146c34d321a41a1 100644 (file)
@@ -917,13 +917,11 @@ static int ReadICYMeta( access_t *p_access )
     for( i_read = 0; i_read < i_size; )
     {
         int i_tmp;
-        if( ReadData( p_access, &i_tmp, (uint8_t *)&psz_meta[i_read], i_size - i_read ) )
+        if( ReadData( p_access, &i_tmp, (uint8_t *)&psz_meta[i_read], i_size - i_read ) || i_tmp <= 0 )
         {
             free( psz_meta );
             return VLC_EGENERIC;
         }
-        if( i_tmp <= 0 )
-            return VLC_EGENERIC;
         i_read += i_tmp;
     }
     psz_meta[i_read] = '\0'; /* Just in case */