Changeset 7eaca895c90b3f14ab208373d0213d0579515e70

Show
Ignore:
Timestamp:
05/22/08 23:24:08 (3 months ago)
Author:
Rémi Duraffort <ivoire@videolan.org>
git-committer:
Rémi Duraffort <ivoire@videolan.org> 1211491448 +0200
git-parent:

[fa781f2253cc4438cddfc4420b23496a42df66bd]

git-author:
Rémi Duraffort <ivoire@videolan.org> 1211486308 +0200
Message:

Check malloc return value when needed and don't print an error when such error happend.
Fix a potential segfault.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/aa.c

    r13ae40b r7eaca89  
    9191    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    9292    if( p_vout->p_sys == NULL ) 
    93     { 
    94         msg_Err( p_vout, "out of memory" ); 
    9593        return( 1 ); 
    96     } 
    9794 
    9895    /* Don't parse any options, but take $AAOPTS into account */ 

  • modules/video_output/caca.c

    r13ae40b r7eaca89  
    164164    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    165165    if( p_vout->p_sys == NULL ) 
    166     { 
    167         msg_Err( p_vout, "out of memory" ); 
    168166        return VLC_ENOMEM; 
    169     } 
    170167 
    171168    p_vout->p_sys->p_cv = cucul_create_canvas(0, 0); 

  • modules/video_output/directfb.c

    r13ae40b r7eaca89  
    9090    p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) ); 
    9191    if( !p_sys ) 
    92     { 
    93         msg_Err( p_vout, "out of memory" ); 
    9492        return VLC_ENOMEM; 
    95     } 
    9693 
    9794    p_sys->p_directfb = NULL; 

  • modules/video_output/fb.c

    r13ae40b r7eaca89  
    187187    p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) ); 
    188188    if( p_vout->p_sys == NULL ) 
    189     { 
    190         msg_Err( p_vout, "out of memory" ); 
    191189        return VLC_ENOMEM; 
    192     }; 
    193190    memset( p_sys, 0, sizeof(vout_sys_t) ); 
    194191 
    …… 
    875872        if( !p_sys->p_palette ) 
    876873        { 
    877             msg_Err( p_vout, "out of memory" ); 
    878  
    879874            /* Restore fb config */ 
    880875            ioctl( p_sys->i_fd, FBIOPUT_VSCREENINFO, &p_sys->old_info ); 

  • modules/video_output/ggi.c

    r27d483e r7eaca89  
    105105    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    106106    if( p_vout->p_sys == NULL ) 
    107     { 
    108         msg_Err( p_vout, "out of memory" ); 
    109         return( 1 ); 
    110     } 
     107        return( 1 ); 
    111108 
    112109    /* Open and initialize device */ 

  • modules/video_output/glide.c

    r13ae40b r7eaca89  
    9797    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    9898    if( p_vout->p_sys == NULL ) 
    99     { 
    100         msg_Err( p_vout, "out of memory" ); 
    101         return( 1 ); 
    102     } 
     99        return( 1 ); 
    103100 
    104101    /* Open and initialize device */ 

  • modules/video_output/hd1000v.cpp

    r13ae40b r7eaca89  
    9898    p_vout->p_sys = (struct vout_sys_t*) malloc( sizeof(struct vout_sys_t) ); 
    9999    if( p_vout->p_sys == NULL ) 
    100     { 
    101         msg_Err( p_vout, "out of memory" ); 
    102         return VLC_EGENERIC; 
    103     } 
     100        return VLC_ENOMEM; 
    104101 
    105102    /* Allocate a screen for VLC vout. */ 

  • modules/video_output/image.c

    r13ae40b r7eaca89  
    316316    psz_filename = (char *)malloc( 10 + strlen( psz_prefix ) 
    317317                                      + strlen( p_vout->p_sys->psz_format ) ); 
     318    if( !psz_filename ) 
     319        return; 
     320 
    318321    if( p_vout->p_sys->b_replace ) 
    319322    { 

  • modules/video_output/mga.c

    r13ae40b r7eaca89  
    138138    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    139139    if( p_vout->p_sys == NULL ) 
    140     { 
    141         msg_Err( p_vout, "out of memory" ); 
    142140        return( 1 ); 
    143     } 
    144141 
    145142    p_vout->p_sys->i_fd = open( "/dev/mga_vid", O_RDWR ); 

  • modules/video_output/msw/direct3d.c

    r13ae40b r7eaca89  
    154154    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    155155    if( p_vout->p_sys == NULL ) 
    156     { 
    157         msg_Err( p_vout, "out of memory" ); 
    158156        return VLC_ENOMEM; 
    159     } 
    160157    memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); 
    161158 

  • modules/video_output/msw/directx.c

    r13ae40b r7eaca89  
    211211    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    212212    if( p_vout->p_sys == NULL ) 
    213     { 
    214         msg_Err( p_vout, "out of memory" ); 
    215213        return VLC_ENOMEM; 
    216     } 
    217214    memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); 
    218215 

  • modules/video_output/msw/events.c

    r937e898 r7eaca89  
    344344            { 
    345345                wchar_t *psz_title = malloc( strlen(val.psz_string) * 2 + 2 ); 
    346                 mbstowcs( psz_title, val.psz_string, strlen(val.psz_string)*2); 
    347                 psz_title[strlen(val.psz_string)] = 0; 
    348                 free( val.psz_string ); val.psz_string = (char *)psz_title; 
     346                if( psz_title ) 
     347                { 
     348                    mbstowcs( psz_title, val.psz_string, strlen(val.psz_string)*2); 
     349                    psz_title[strlen(val.psz_string)] = 0; 
     350                    free( val.psz_string ); val.psz_string = (char *)psz_title; 
     351                } 
    349352            } 
    350353#endif 

  • modules/video_output/msw/glwin32.c

    r13ae40b r7eaca89  
    9797    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    9898    if( p_vout->p_sys == NULL ) 
    99     { 
    100         msg_Err( p_vout, "out of memory" ); 
    10199        return VLC_ENOMEM; 
    102     } 
    103100    memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); 
    104101 

  • modules/video_output/opengl.c

    r13ae40b r7eaca89  
    251251    p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) ); 
    252252    if( p_sys == NULL ) 
    253     { 
    254         msg_Err( p_vout, "out of memory" ); 
    255         return VLC_EGENERIC; 
    256     } 
     253        return VLC_ENOMEM; 
    257254 
    258255    var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); 
    …… 
    410407        malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch ); 
    411408    if( !p_sys->pp_buffer[0] ) 
    412     { 
    413         msg_Err( p_vout, "out of memory" ); 
    414409        return -1; 
    415     } 
    416410    p_sys->pp_buffer[1] = 
    417411        malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch ); 
    418412    if( !p_sys->pp_buffer[1] ) 
    419     { 
    420         msg_Err( p_vout, "out of memory" ); 
    421413        return -1; 
    422     } 
    423414 
    424415    p_vout->p_picture[0].i_planes = 1; 

  • modules/video_output/qte/qte.cpp

    r13ae40b r7eaca89  
    144144 
    145145    if( p_vout->p_sys == NULL ) 
    146     { 
    147         msg_Err( p_vout, "out of memory" ); 
    148146        return( 1 ); 
    149     } 
    150147 
    151148    p_vout->pf_init    = Init; 

  • modules/video_output/x11/xcommon.c

    r602005b r7eaca89  
    207207    p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); 
    208208    if( p_vout->p_sys == NULL ) 
    209     { 
    210         msg_Err( p_vout, "out of memory" ); 
    211209        return VLC_ENOMEM; 
    212     } 
    213210 
    214211    vlc_mutex_init( &p_vout->p_sys->lock ); 
    …… 
    29432940#endif 
    29442941    if( !p_data ) 
    2945     { 
    2946         msg_Err( p_vout, "out of memory" ); 
    29472942        return NULL; 
    2948     } 
    29492943 
    29502944#ifdef MODULE_NAME_IS_x11