Magellan Linux

Annotation of /trunk/mplayer/patches/mplayer-1.0_rc1-CAL-20070912-1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 358 - (hide annotations) (download)
Thu Sep 13 20:32:33 2007 UTC (16 years, 9 months ago) by niro
File size: 1046 byte(s)
-security fix: see http://www.vulnhunt.com/advisories/CAL-20070912-1_Multiple_vendor_produce_handling_AVI_file_vulnerabilities.txt

1 niro 358 --- trunk/libmpdemux/aviheader.c 2007/08/01 09:01:28 23985
2     +++ trunk/libmpdemux/aviheader.c 2007/09/13 15:18:57 24447
3     @@ -233,16 +233,16 @@
4    
5     print_avisuperindex_chunk(s,MSGL_V);
6    
7     - if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
8     - mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
9     - s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
10     - }
11     -
12     // Check and fix this useless crap
13     if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
14     mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size: %u\n",s->wLongsPerEntry);
15     s->wLongsPerEntry = sizeof(avisuperindex_entry)/4;
16     }
17     + if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
18     + mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
19     + s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
20     + }
21     +
22     s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry));
23     s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk));
24