Changeset fc9f851816aa9d98dfbc84c8ffee4a00d58d4e6b

Show
Ignore:
Timestamp:
26/05/08 22:34:35 (6 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1211834075 +0200
git-parent:

[c865a653ad0a4341af807a2018c8686a4a1c5bf2]

git-author:
bl4 <bl4@playker.info> 1211653069 +0200
Message:

mms/tcp: hanging or unexpected seeking after the end of stream

Signed-off-by: Rafaël Carré <funman@videolan.org>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/mms/mmstu.c

    rda9d246 rfc9f851  
    400400    size_t      i_data; 
    401401    size_t      i_copy; 
     402 
     403    if( p_access->info.b_eof ) 
     404    { 
     405        return 0; 
     406    } 
    402407 
    403408    i_data = 0; 

  • src/input/stream.c

    r6dad9cd rfc9f851  
    10261026        stream_sys_t *p_sys = s->p_sys; 
    10271027        access_t     *p_access = p_sys->p_access; 
    1028         bool   b_aseek; 
    1029         access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); 
    1030         if( b_aseek ) 
    1031             return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read; 
     1028 
     1029        /* seeking after EOF is not what we want */ 
     1030        if( !( p_access->info.b_eof ) ) 
     1031        { 
     1032            bool   b_aseek; 
     1033            access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); 
     1034            if( b_aseek ) 
     1035                return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read; 
     1036        } 
    10321037    } 
    10331038