[MPlayer-cvslog] r27265 - trunk/libmpdemux/demux_mov.c

[reimar]

Author: reimar
Date: Sat Jul 12 00:03:01 2008
New Revision: 27265

Log:
Check size of tkdata before using it in mov demuxer.
Fixes bug #1170 and others.


Modified:
   trunk/libmpdemux/demux_mov.c

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	(original)
+++ trunk/libmpdemux/demux_mov.c	Sat Jul 12 00:03:01 2008
@@ -1114,6 +1114,7 @@ static int gen_sh_video(sh_video_t* sh, 
 
 		sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8);
 		sh->disp_h=trak->stdata[27]|(trak->stdata[26]<<8);
+		if(trak->tkdata_len>81) {
 		// if image size is zero, fallback to display size
 		if(!sh->disp_w && !sh->disp_h) {
 		  sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8);
@@ -1123,6 +1124,7 @@ static int gen_sh_video(sh_video_t* sh, 
 		  sh->aspect=trak->tkdata[77]|(trak->tkdata[76]<<8);
 		  sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8);
 		}
+		}
 		
 		if(depth>32+8) mp_msg(MSGT_DEMUX, MSGL_INFO,"*** depth = 0x%X\n",depth);