[MPlayer-cvslog] CVS: main/libmpdemux muxer.c,1.14,1.15

[Nico Sabbi]

Rich Felker wrote:

>On Sun, Mar 12, 2006 at 09:58:27PM +0100, Michael Niedermayer wrote:
>  
>
>>Hi
>>
>>On Sun, Mar 12, 2006 at 07:13:14PM +0100, Nico Sabbi CVS wrote:
>>    
>>
>>>Index: muxer.c
>>>===================================================================
>>>RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v
>>>retrieving revision 1.14
>>>retrieving revision 1.15
>>>diff -u -r1.14 -r1.15
>>>--- muxer.c	26 Jan 2006 19:32:07 -0000	1.14
>>>+++ muxer.c	12 Mar 2006 18:13:11 -0000	1.15
>>>@@ -21,30 +21,47 @@
>>> muxer_t *muxer_new_muxer(int type,FILE *f){
>>>     muxer_t* muxer=malloc(sizeof(muxer_t));
>>>     memset(muxer,0,sizeof(muxer_t));
>>>+    if(!muxer)
>>>+        return NULL;
>>>      
>>>
>>memset before the check?!
>>    
>>

replaced with calloc()

>>a goto fail; everywhere and a fail: if(muxer) free(muxer); return NULL; at
>>the end would be IMHO simpler and cleaner
>>    
>>
>
>Agree.
>
>Rich
>
>  
>

done