Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7914eb21f43d7a06a86774f5e8a7bdc751d984a6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7914eb21f43d7a06a86774f5e8a7bdc751d984a6)
  • Date: Sun, 9 Mar 2008 04:23:20 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video/mplayer/DETAILS | 2 -
video/mplayer/HISTORY | 5 +++
video/mplayer/PRE_BUILD | 10 ++++++
video/mplayer/demux_audio_fix_20080129.diff | 11 ++++++
video/mplayer/demux_mov_fix_20080129.diff | 45
++++++++++++++++++++++++++++
video/mplayer/stream_cddb_fix_20080120.diff | 32 +++++++++++++++++++
video/mplayer/url_fix_20080120.diff | 10 ++++++
7 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit 41ccacb4bf15da5b6593fee45891be0d18d8dbde
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/mplayer: added four security patches

diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 74ced5e..6b7da33 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -18,7 +18,7 @@ else
SOURCE_URL[2]=ftp://ftp5.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
fi
PATCHLEVEL=1
WEB_SITE=http://www.mplayerhq.hu
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 6b4876b..9427320 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2008-03-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, demux_audio_fix_20080129.diff,
+ demux_mov_fix_20080129.diff, stream_cddb_fix_20080120.diff,
+ url_fix_20080120.diff: added four security patches
+
2008-02-25 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: added png icon

diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
new file mode 100755
index 0000000..e1581bc
--- /dev/null
+++ b/video/mplayer/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+if [[ ! $MPLAYER_SVN = y ]]; then
+ cd $SOURCE_DIRECTORY &&
+ for i in demux_audio_fix_20080129.diff \
+ demux_mov_fix_20080129.diff \
+ stream_cddb_fix_20080120.diff \
+ url_fix_20080120.diff; do
+ patch -p0 < $SCRIPT_DIRECTORY/$i
+ done
+fi
diff --git a/video/mplayer/demux_audio_fix_20080129.diff
b/video/mplayer/demux_audio_fix_20080129.diff
new file mode 100644
index 0000000..1b18b6e
--- /dev/null
+++ b/video/mplayer/demux_audio_fix_20080129.diff
@@ -0,0 +1,11 @@
+--- libmpdemux/demux_audio.c (revision 24724)
++++ libmpdemux/demux_audio.c (working copy)
+@@ -229,6 +229,8 @@
+ ptr += 4;
+
+ comment = ptr;
++ if (&comment[length] < comments || &comment[length] >=
&comments[blk_len])
++ return;
+ c = comment[length];
+ comment[length] = 0;
+
diff --git a/video/mplayer/demux_mov_fix_20080129.diff
b/video/mplayer/demux_mov_fix_20080129.diff
new file mode 100644
index 0000000..d83477b
--- /dev/null
+++ b/video/mplayer/demux_mov_fix_20080129.diff
@@ -0,0 +1,45 @@
+--- libmpdemux/demux_mov.c (revision 24724)
++++ libmpdemux/demux_mov.c (working copy)
+@@ -173,11 +173,12 @@
+ i=trak->chunkmap_size;
+ while(i>0){
+ --i;
+- for(j=trak->chunkmap[i].first;j<last;j++){
++ j=FFMAX(trak->chunkmap[i].first, 0);
++ for(;j<last;j++){
+ trak->chunks[j].desc=trak->chunkmap[i].sdid;
+ trak->chunks[j].size=trak->chunkmap[i].spc;
+ }
+- last=trak->chunkmap[i].first;
++ last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
+ }
+
+ #if 0
+@@ -235,6 +236,8 @@
+ s=0;
+ for(j=0;j<trak->durmap_size;j++){
+ for(i=0;i<trak->durmap[j].num;i++){
++ if (s >= trak->samples_size)
++ break;
+ trak->samples[s].pts=pts;
+ ++s;
+ pts+=trak->durmap[j].dur;
+@@ -246,6 +249,8 @@
+ for(j=0;j<trak->chunks_size;j++){
+ off_t pos=trak->chunks[j].pos;
+ for(i=0;i<trak->chunks[j].size;i++){
++ if (s >= trak->samples_size)
++ break;
+ trak->samples[s].pos=pos;
+ mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X
size=%d\n",s,
+ trak->samples[s].pts,
+@@ -1568,8 +1573,7 @@
+ if( udta_len>udta_size)
+ udta_len=udta_size;
+ {
+- char dump[udta_len-4];
+- stream_read(demuxer->stream, (char *)&dump,
udta_len-4-4);
++ stream_skip(demuxer->stream, udta_len-4-4);
+ udta_size -= udta_len;
+ }
+ }
diff --git a/video/mplayer/stream_cddb_fix_20080120.diff
b/video/mplayer/stream_cddb_fix_20080120.diff
new file mode 100644
index 0000000..45f7226
--- /dev/null
+++ b/video/mplayer/stream_cddb_fix_20080120.diff
@@ -0,0 +1,32 @@
+--- stream/stream_cddb.c (revision 24724)
++++ stream/stream_cddb.c (working copy)
+@@ -53,6 +53,7 @@
+ #include "version.h"
+ #include "stream.h"
+ #include "network.h"
++#include "libavutil/intreadwrite.h"
+
+ #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
+ #define DEFAULT_CACHE_DIR "/.cddb/"
+@@ -453,8 +454,9 @@
+ } else {
+ len = ptr2-ptr+1;
+ }
++ len = FFMIN(sizeof(album_title) - 1, len);
+ strncpy(album_title, ptr, len);
+- album_title[len-2]='\0';
++ album_title[len]='\0';
+ }
+ mp_msg(MSGT_DEMUX, MSGL_STATUS,
MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
+ return 0;
+@@ -490,8 +492,9 @@
+ } else {
+ len = ptr2-ptr+1;
+ }
++ len = FFMIN(sizeof(album_title) - 1, len);
+ strncpy(album_title, ptr, len);
+- album_title[len-2]='\0';
++ album_title[len]='\0';
+ }
+ mp_msg(MSGT_DEMUX, MSGL_STATUS,
MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
+ return cddb_request_titles(cddb_data);
diff --git a/video/mplayer/url_fix_20080120.diff
b/video/mplayer/url_fix_20080120.diff
new file mode 100644
index 0000000..a073589
--- /dev/null
+++ b/video/mplayer/url_fix_20080120.diff
@@ -0,0 +1,10 @@
+--- stream/url.c (revision 24724)
++++ stream/url.c (working copy)
+@@ -328,6 +328,7 @@
+ }
+ }
+
++ tmp = NULL;
+ while(i < len) {
+ // look for the next char that must be kept
+ for (j=i;j<len;j++) {



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7914eb21f43d7a06a86774f5e8a7bdc751d984a6), Florian Franzmann, 03/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page