Changeset 607b545809d15bf655bd4b50ff68206d8aa97fb8

Show
Ignore:
Timestamp:
21/12/07 16:56:50 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1198252610 +0000
git-parent:

[2004f95fe5f6c8ff2903bc89b4044236224d4f6d]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1198252610 +0000
Message:
  • Fix error handling
  • Fix a warning
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/udp.c

    rd8fc0a9 r607b545  
    327327    access_sys_t *p_sys = p_access->p_sys; 
    328328    block_t      *p_block; 
     329    ssize_t len; 
    329330 
    330331    if( p_access->info.b_eof ) 
    …… 
    333334    /* Read data */ 
    334335    p_block = block_New( p_access, MTU ); 
    335     p_block->i_buffer = net_Read( p_access, p_sys->fd, NULL, 
    336                                   p_block->p_buffer, MTU, VLC_FALSE ); 
    337     if( ( p_block->i_buffer < 0 ) 
    338      || ( p_sys->b_comedia && ( p_block->i_buffer == 0 ) ) ) 
     336    len = net_Read( p_access, p_sys->fd, NULL, 
     337                    p_block->p_buffer, MTU, VLC_FALSE ); 
     338    if( ( len < 0 ) 
     339     || ( p_sys->b_comedia && ( len == 0 ) ) ) 
    339340    { 
    340341        if( p_sys->b_comedia ) 
    …… 
    347348    } 
    348349 
    349     return block_Realloc( p_block, 0, p_block->i_buffer ); 
     350    return block_Realloc( p_block, 0, p_block->i_buffer = len ); 
    350351} 
    351352 
    …… 
    396397    } 
    397398 
    398     if( p_block->i_buffer < (2 + framelen) ) 
     399    if( p_block->i_buffer < (2u + framelen) ) 
    399400        return NULL; // incomplete frame 
    400401