Mercurial > mplayer.hg

diff libmpdemux/demux_mov.c @ 15783:dd5d3924a1ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid bad memory access
author reimar
date Mon, 20 Jun 2005 14:32:51 +0000
parents 490dff9ee43f
children 8082c89f75c5
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Mon Jun 20 14:30:02 2005 +0000
+++ b/libmpdemux/demux_mov.c	Mon Jun 20 14:32:51 2005 +0000
@@ -996,7 +996,9 @@
 		  }
 		}
 
-		if((trak->stdata[9]==0 || trak->stdata[9]==1) && trak->stdata_len >= 36) { // version 0 with extra atoms
+		if ((trak->stdata[9] == 0 && trak->stdata_len >= 36) ||
+		    (trak->stdata[9] == 1 && trak->stdata_len >= 36 + 48)) {
+		    // version 0 with extra atoms
         int adjust = (trak->stdata[9]==1)?48:0;
 		    int atom_len = char2int(trak->stdata,28+adjust);
 		    switch(char2int(trak->stdata,32+adjust)) { // atom type