commit:     4d2516ef563fdf2a533b427a139f7552da97dfd7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 06:20:46 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 06:21:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2516ef

x11-wm/wmfs: Actually apply dropped patch instead

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-wm/wmfs/files/wmfs-99999999-strncat.patch | 20 ++++++++++++++++++++
 x11-wm/wmfs/wmfs-99999999.ebuild              |  1 +
 2 files changed, 21 insertions(+)

diff --git a/x11-wm/wmfs/files/wmfs-99999999-strncat.patch 
b/x11-wm/wmfs/files/wmfs-99999999-strncat.patch
new file mode 100644
index 00000000000..e55cd00121b
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-strncat.patch
@@ -0,0 +1,20 @@
+--- a/src/launcher.c
++++ b/src/launcher.c
+@@ -366,7 +366,7 @@
+                if(pos && (end = complete(&cache, tmpbuf)))
+                {
+                     strncpy(buf, tmpbuf, sizeof(buf));
+-                    strncat(buf, end, sizeof(buf));
++                    strncat(buf, end, sizeof(buf) - 1);
+                     found = true;
+                }
+ 
+@@ -387,7 +387,7 @@
+ 
+           default:
+                lastwastab = false;
+-               strncat(buf, tmp, sizeof(tmp));
++               strncat(buf, tmp, sizeof(buf) - 1);
+                ++pos;
+                break;
+           }

diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index a2a1959136e..416f8f678db 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-99999999-Debian.patch
        "${FILESDIR}"/${PN}-99999999-desktop.patch
        "${FILESDIR}"/${PN}-99999999-fno-common.patch
+       "${FILESDIR}"/${PN}-99999999-strncat.patch
 )
 
 src_configure() {

Reply via email to