[pkgsrc/trunk]: pkgsrc/multimedia two security patches: Real RTSP heap overfl...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3dc90af58a3
branches:  trunk
changeset: 492620:e3dc90af58a3
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sat Apr 16 17:43:09 2005 +0000

description:
two security patches: Real RTSP heap overflow, MMST heap overflow
(both patches published on the mplayer website)
bump PKGREVISION of affected pkgs

diffstat:

 multimedia/gmplayer/Makefile              |   4 ++--
 multimedia/gmplayer/distinfo              |   4 +++-
 multimedia/mencoder/Makefile              |   3 ++-
 multimedia/mplayer-share/distinfo         |   4 +++-
 multimedia/mplayer-share/patches/patch-ba |  21 +++++++++++++++++++++
 multimedia/mplayer-share/patches/patch-bb |  17 +++++++++++++++++
 multimedia/mplayer/Makefile               |   4 ++--
 7 files changed, 50 insertions(+), 7 deletions(-)

diffs (119 lines):

diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Sat Apr 16 16:58:57 2005 +0000
+++ b/multimedia/gmplayer/Makefile      Sat Apr 16 17:43:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/04/16 17:43:09 drochner Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 
 SKIN_SITES=    http://www.mplayerhq.hu/MPlayer/Skin/           \
                ftp://ftp.mplayerhq.hu/MPlayer/Skin/            \
diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/gmplayer/distinfo
--- a/multimedia/gmplayer/distinfo      Sat Apr 16 16:58:57 2005 +0000
+++ b/multimedia/gmplayer/distinfo      Sat Apr 16 17:43:09 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2005/04/09 11:19:32 abs Exp $
+$NetBSD: distinfo,v 1.25 2005/04/16 17:43:09 drochner Exp $
 
 SHA1 (gmplayer-1.0rc6-20050409/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
 RMD160 (gmplayer-1.0rc6-20050409/MPlayer-1.0pre6a.tar.bz2) = a0e866906bd9f87b93ad35e47aaa24f69ef7224e
@@ -68,3 +68,5 @@
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = e3b1a98d86f377b84a4f92673f878d287ae5aa6d
+SHA1 (patch-ba) = be78ddba2d58230cf12f186b746d46b01c2836bc
+SHA1 (patch-bb) = 90e635cf521d8ba0f3f4e9dafc1e298abf8e315f
diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Sat Apr 16 16:58:57 2005 +0000
+++ b/multimedia/mencoder/Makefile      Sat Apr 16 17:43:09 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/16 17:43:09 drochner Exp $
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
+PKGREVISION=   1
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 
diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Sat Apr 16 16:58:57 2005 +0000
+++ b/multimedia/mplayer-share/distinfo Sat Apr 16 17:43:09 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2005/02/24 11:24:04 agc Exp $
+$NetBSD: distinfo,v 1.18 2005/04/16 17:43:09 drochner Exp $
 
 SHA1 (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
 RMD160 (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = a0e866906bd9f87b93ad35e47aaa24f69ef7224e
@@ -17,3 +17,5 @@
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = e3b1a98d86f377b84a4f92673f878d287ae5aa6d
+SHA1 (patch-ba) = be78ddba2d58230cf12f186b746d46b01c2836bc
+SHA1 (patch-bb) = 90e635cf521d8ba0f3f4e9dafc1e298abf8e315f
diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/mplayer-share/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ba Sat Apr 16 17:43:09 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ba,v 1.3 2005/04/16 17:43:09 drochner Exp $
+
+--- libmpdemux/realrtsp/rtsp.c.orig    2005-04-16 21:08:44.000000000 +0200
++++ libmpdemux/realrtsp/rtsp.c
+@@ -397,6 +397,7 @@ static int rtsp_get_answers(rtsp_t *s) {
+   unsigned int answer_seq;
+   char **answer_ptr=s->answers;
+   int code;
++  int ans_count = 0;
+   
+   answer=rtsp_get(s);
+   if (!answer)
+@@ -448,7 +449,7 @@ static int rtsp_get_answers(rtsp_t *s) {
+     }
+     *answer_ptr=answer;
+     answer_ptr++;
+-  } while (strlen(answer)!=0);
++  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
+   
+   s->cseq++;
+   
diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/mplayer-share/patches/patch-bb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-bb Sat Apr 16 17:43:09 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-bb,v 1.3 2005/04/16 17:43:09 drochner Exp $
+
+--- libmpdemux/asf_mmst_streaming.c.orig       2005-04-16 21:10:36.000000000 +0200
++++ libmpdemux/asf_mmst_streaming.c
+@@ -334,8 +334,12 @@ static int interp_header (uint8_t *heade
+ 
+       printf ("stream object, stream id: %d\n", stream_id);
+ 
++      if (num_stream_ids < 20) {
+       stream_ids[num_stream_ids] = stream_id;
+       num_stream_ids++;
++      } else {
++      printf ("too many id, stream skipped");
++      }
+       
+     } else {
+       printf ("unknown object\n");
diff -r 9294ac88aca5 -r e3dc90af58a3 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Sat Apr 16 16:58:57 2005 +0000
+++ b/multimedia/mplayer/Makefile       Sat Apr 16 17:43:09 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/16 17:43:09 drochner Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder