Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK change 9189 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK change 9189 to grimoire.svk
  • Date: Sun, 11 Jun 2006 11:59:14 -0500

Group: defaults
Subject: r9189 - in test: . video/mplayer

Author: arwed
Date: Sun Jun 11 11:59:14 2006
New Revision: 9189

Added:
test/video/mplayer/patch-CVE-2006-1502
Modified:
test/ (props changed)
test/video/mplayer/DETAILS
test/video/mplayer/HISTORY
test/video/mplayer/PRE_BUILD

Log:
r9234@Otherland: arwed | 1970-01-01 01:00:00 +0200
mplayer: security patch, bug 10883


Modified: test/video/mplayer/DETAILS
==============================================================================
--- test/video/mplayer/DETAILS (original)
+++ test/video/mplayer/DETAILS Sun Jun 11 11:59:14 2006
@@ -19,6 +19,7 @@
SOURCE_HASH=sha1:dcaced128167f15d094c9b63ca8b3dfd8f583e32
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
GCC_VERSION=3.4
+ SECURITY_PATCH=1
fi
WEB_SITE=http://www.mplayerhq.hu
LICENSE[0]=GPL

Modified: test/video/mplayer/HISTORY
==============================================================================
--- test/video/mplayer/HISTORY (original)
+++ test/video/mplayer/HISTORY Sun Jun 11 11:59:14 2006
@@ -1,3 +1,7 @@
+2006-06-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, patch-CVS-2006-1502: security patch for bug #10883
+ * DETAILS: SECURITY_PATCH=1 for the release version
+
2006-06-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: switched from snapshot to new svn checkout for the scm
version

Modified: test/video/mplayer/PRE_BUILD
==============================================================================
--- test/video/mplayer/PRE_BUILD (original)
+++ test/video/mplayer/PRE_BUILD Sun Jun 11 11:59:14 2006
@@ -13,6 +13,8 @@
else
# some incompatibility, probably with current glibc
sedit 's/getline/vs_getline/' vobsub.c &&
+ # patch for bug #10883
+ patch -p0 < $SCRIPT_DIRECTORY/patch-CVE-2006-1502 &&
# fixes bug #6833
patch Makefile $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/mplayer-headers.patch

Added: test/video/mplayer/patch-CVE-2006-1502
==============================================================================
--- (empty file)
+++ test/video/mplayer/patch-CVE-2006-1502 Sun Jun 11 11:59:14 2006
@@ -0,0 +1,69 @@
+--- libmpdemux/aviheader.c.orig Tue Feb 22 17:24:18 2005
++++ libmpdemux/aviheader.c Fri Apr 7 11:56:53 2006
+@@ -205,8 +205,10 @@
+ break; }
+ case mmioFOURCC('i', 'n', 'd', 'x'): {
+ uint32_t i;
+- unsigned msize = 0;
+ avisuperindex_chunk *s;
++ if(chunksize<=24){
++ break;
++ }
+ priv->suidx_size++;
+ priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof
(avisuperindex_chunk));
+ s = &priv->suidx[priv->suidx_size-1];
+@@ -224,11 +226,18 @@
+
+ print_avisuperindex_chunk(s);
+
+- msize = sizeof (uint32_t) * s->wLongsPerEntry * s->nEntriesInUse;
+- s->aIndex = malloc(msize);
+- memset (s->aIndex, 0, msize);
+- s->stdidx = malloc (s->nEntriesInUse * sizeof (avistdindex_chunk));
+- memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk));
++ if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
++ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
++ s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
++ }
++
++ // Check and fix this useless crap
++ if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
++ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size:
%u\n",s->wLongsPerEntry);
++ s->wLongsPerEntry = sizeof(avisuperindex_entry)/4;
++ }
++ s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry));
++ s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk));
+
+ // now the real index of indices
+ for (i=0; i<s->nEntriesInUse; i++) {
+@@ -636,6 +645,8 @@
+ idx->dwChunkLength=len;
+
+ c=stream_read_dword(demuxer->stream);
++
++ if(!len) idx->dwFlags&=~AVIIF_KEYFRAME;
+
+ // Fix keyframes for DivX files:
+ if(idxfix_divx)
+--- libmpdemux/asfheader.c.orig Sat Dec 25 09:31:32 2004
++++ libmpdemux/asfheader.c Fri Apr 7 11:55:29 2006
+@@ -189,7 +189,7 @@
+ while ((pos = find_asf_guid(hdr, asf_stream_header_guid, pos, hdr_len))
>= 0)
+ {
+ ASF_stream_header_t *streamh = (ASF_stream_header_t *)&hdr[pos];
+- char *buffer;
++ uint8_t *buffer;
+ pos += sizeof(ASF_stream_header_t);
+ if (pos > hdr_len) goto len_err_out;
+ le2me_ASF_stream_header_t(streamh);
+@@ -222,7 +222,9 @@
+ asf_scrambling_h=buffer[0];
+ asf_scrambling_w=(buffer[2]<<8)|buffer[1];
+ asf_scrambling_b=(buffer[4]<<8)|buffer[3];
+- asf_scrambling_w/=asf_scrambling_b;
++ if(asf_scrambling_b>0){
++ asf_scrambling_w/=asf_scrambling_b;
++ }
+ } else {
+ asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1;
+ }



  • [SM-Commit] SVK change 9189 to grimoire.svk, Arwed von Merkatz, 06/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page