[MPlayer-cvslog] CVS: main/libmpdemux muxer_mpeg.c,1.41,1.42

Nico Sabbi CVS syncmail at mplayerhq.hu
Sun Mar 12 00:38:56 CET 2006

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv29907

Modified Files:
Log Message:
dereference muxer->priv only after having checked muxer!=NULL in write_chunk(); closes cid 206

Index: muxer_mpeg.c
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- muxer_mpeg.c	11 Mar 2006 23:21:09 -0000	1.41
+++ muxer_mpeg.c	11 Mar 2006 23:38:54 -0000	1.42
@@ -327,11 +327,12 @@
 static int add_frame(muxer_headers_t *spriv, uint64_t idur, uint8_t *ptr, int len, uint8_t pt, uint32_t temp_ref);
 static muxer_stream_t* mpegfile_new_stream(muxer_t *muxer,int type){
-  muxer_priv_t *priv = (muxer_priv_t*) muxer->priv;
+  muxer_priv_t *priv;
   muxer_stream_t *s;
   muxer_headers_t *spriv;
   if (!muxer) return NULL;
+  priv = (muxer_priv_t*) muxer->priv;
     mp_msg(MSGT_MUXER, MSGL_ERR, "Too many streams! increase MUXER_MAX_STREAMS !\n");
     return NULL;

More information about the MPlayer-cvslog mailing list