summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-04-16 13:44:48 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-04-16 13:44:48 +0000
commit254c7ca9c8865523a76946b6c74e1a3901c4d8a0 (patch)
tree0371bb3ceecdd747757b5eeaa5a7b9a8d2cbb01c /media-video/mplayer/files
parentstable on amd64 wrt security bug #89149 (diff)
downloadgentoo-2-254c7ca9c8865523a76946b6c74e1a3901c4d8a0.tar.gz
gentoo-2-254c7ca9c8865523a76946b6c74e1a3901c4d8a0.tar.bz2
gentoo-2-254c7ca9c8865523a76946b6c74e1a3901c4d8a0.zip
added 2 security related patches to the _pre6 ebuilds. see #89277. also updated metadata.xml, chriswhite is retired.
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-video/mplayer/files')
-rw-r--r--media-video/mplayer/files/mmst_fix_20050415.diff16
-rw-r--r--media-video/mplayer/files/rtsp_fix_20050415.diff20
2 files changed, 36 insertions, 0 deletions
diff --git a/media-video/mplayer/files/mmst_fix_20050415.diff b/media-video/mplayer/files/mmst_fix_20050415.diff
new file mode 100644
index 000000000000..43f4c5c1919a
--- /dev/null
+++ b/media-video/mplayer/files/mmst_fix_20050415.diff
@@ -0,0 +1,16 @@
+diff -ruN MPlayer-1.0pre5try2_old/libmpdemux/asf_mmst_streaming.c MPlayer-1.0pre5try2/libmpdemux/asf_mmst_streaming.c
+--- MPlayer-1.0pre5try2_old/libmpdemux/asf_mmst_streaming.c 2004-12-15 22:18:31.000000000 +0100
++++ MPlayer-1.0pre5try2/libmpdemux/asf_mmst_streaming.c 2005-04-16 09:43:16.000000000 +0200
+@@ -334,8 +334,12 @@
+
+ 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 --git a/media-video/mplayer/files/rtsp_fix_20050415.diff b/media-video/mplayer/files/rtsp_fix_20050415.diff
new file mode 100644
index 000000000000..229157818284
--- /dev/null
+++ b/media-video/mplayer/files/rtsp_fix_20050415.diff
@@ -0,0 +1,20 @@
+diff -ruN MPlayer-1.0pre5try2_old/libmpdemux/realrtsp/rtsp.c MPlayer-1.0pre5try2/libmpdemux/realrtsp/rtsp.c
+--- MPlayer-1.0pre5try2_old/libmpdemux/realrtsp/rtsp.c 2004-06-26 12:38:26.000000000 +0200
++++ MPlayer-1.0pre5try2/libmpdemux/realrtsp/rtsp.c 2005-04-16 09:41:22.000000000 +0200
+@@ -397,6 +397,7 @@
+ 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 @@
+ }
+ *answer_ptr=answer;
+ answer_ptr++;
+- } while (strlen(answer)!=0);
++ } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
+
+ s->cseq++;
+