diff options
author | ryoon <ryoon@pkgsrc.org> | 2015-02-23 23:53:14 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2015-02-23 23:53:14 +0000 |
commit | d0ae009f0cb532ca0a03dfe199646d7615c5d358 (patch) | |
tree | 00d108c269908850abdad13e4c7d9543ac57bdbb /audio/pulseaudio | |
parent | eb303566535e9c0c25606459c55da9851b72b046 (diff) | |
download | pkgsrc-d0ae009f0cb532ca0a03dfe199646d7615c5d358.tar.gz |
Remove a patch that was taken from upstream.
Diffstat (limited to 'audio/pulseaudio')
-rw-r--r-- | audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c b/audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c deleted file mode 100644 index 9b89b2b16f2..00000000000 --- a/audio/pulseaudio/patches/patch-src_modules_rtp_rtp.c +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-src_modules_rtp_rtp.c,v 1.3 2014/08/07 07:43:48 spz Exp $ - -fix for CVE-2014-3970 taken from pulseaudio git - ---- src/modules/rtp/rtp.c.orig 2014-01-23 18:57:55.000000000 +0000 -+++ src/modules/rtp/rtp.c -@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_me - goto fail; - } - -- if (size <= 0) -- return 0; -+ if (size <= 0) { -+ /* size can be 0 due to any of the following reasons: -+ * -+ * 1. Somebody sent us a perfectly valid zero-length UDP packet. -+ * 2. Somebody sent us a UDP packet with a bad CRC. -+ * -+ * It is unknown whether size can actually be less than zero. -+ * -+ * In the first case, the packet has to be read out, otherwise the -+ * kernel will tell us again and again about it, thus preventing -+ * reception of any further packets. So let's just read it out -+ * now and discard it later, when comparing the number of bytes -+ * received (0) with the number of bytes wanted (1, see below). -+ * -+ * In the second case, recvmsg() will fail, thus allowing us to -+ * return the error. -+ * -+ * Just to avoid passing zero-sized memchunks and NULL pointers to -+ * recvmsg(), let's force allocation of at least one byte by setting -+ * size to 1. -+ */ -+ size = 1; -+ } - - if (c->memchunk.length < (unsigned) size) { - size_t l; |