<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c36c985b93805e1b89b1b6aad0771bc7764de0b">https://github.com/macports/macports-ports/commit/7c36c985b93805e1b89b1b6aad0771bc7764de0b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 7c36c985b93 xorg-server: fix CVE-2020-14347
</span>7c36c985b93 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7c36c985b93805e1b89b1b6aad0771bc7764de0b
</span>Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
AuthorDate: Sun Aug 2 12:12:15 2020 +0300

<span style='display:block; white-space:pre;color:#404040;'>    xorg-server: fix CVE-2020-14347
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://lists.x.org/archives/xorg-announce/2020-July/003051.html
</span>---
 x11/xorg-server/Portfile                  |  3 ++-
 x11/xorg-server/files/CVE-2020-14347.diff | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac3951e8732..6a531b471e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup       compiler_blacklist_versions 1.0
</span> name            xorg-server
 conflicts       xorg-server-devel xorg-server-1.18
 version         1.20.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision        1
</span> categories      x11 devel
 license         X11
 maintainers     {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,7 @@ configure.env-append \
</span>         RAWCPP=${configure.cpp}
 
 patchfiles \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        CVE-2020-14347.diff \
</span>         0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
         0001-xquartz-Add-stub-ddxInputThread.patch \
         0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/CVE-2020-14347.diff b/x11/xorg-server/files/CVE-2020-14347.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7adec3a16e7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/CVE-2020-14347.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/dix/pixmap.c b/dix/pixmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1186d7dbb..5a0146bbb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/dix/pixmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/dix/pixmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return NullPixmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (!pPixmap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return NullPixmap;
</span></pre><pre style='margin:0'>

</pre>