commit: 860b716b29a547eb7bbd3a9e123962fa531713a9 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> AuthorDate: Wed Nov 4 17:49:39 2020 +0000 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> CommitDate: Wed Nov 4 17:49:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860b716b
media-sound/aqualung: Fix bug #752993. Thanks to Toralf Förster for the report. Closes: https://bugs.gentoo.org/752993 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org> ...{aqualung-1.1.ebuild => aqualung-1.1-r1.ebuild} | 4 +++ ...ng-1.1-r100.ebuild => aqualung-1.1-r101.ebuild} | 4 +++ media-sound/aqualung/files/aqualung-1.1-ifp.patch | 41 ++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/media-sound/aqualung/aqualung-1.1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild similarity index 98% rename from media-sound/aqualung/aqualung-1.1.ebuild rename to media-sound/aqualung/aqualung-1.1-r1.ebuild index ea7f3d62f5a..33bb7a4e90c 100644 --- a/media-sound/aqualung/aqualung-1.1.ebuild +++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild @@ -50,6 +50,10 @@ DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}/${P}-ifp.patch" +) + src_configure() { econf \ --disable-rpath \ diff --git a/media-sound/aqualung/aqualung-1.1-r100.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild similarity index 98% rename from media-sound/aqualung/aqualung-1.1-r100.ebuild rename to media-sound/aqualung/aqualung-1.1-r101.ebuild index 57950edcbf4..fe7a974b3a4 100644 --- a/media-sound/aqualung/aqualung-1.1-r100.ebuild +++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild @@ -52,6 +52,10 @@ DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}/${P}-ifp.patch" +) + src_configure() { econf \ --disable-rpath \ diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch b/media-sound/aqualung/files/aqualung-1.1-ifp.patch new file mode 100644 index 00000000000..490999be948 --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.1-ifp.patch @@ -0,0 +1,41 @@ +From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001 +From: Adam Sampson <a...@offog.org> +Date: Tue, 8 Sep 2020 15:55:12 +0100 +Subject: [PATCH] Fix arr_strlcpy call in ifp_device. + +directory_chooser needs to know the length of the target. +--- + src/ifp_device.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ifp_device.c b/src/ifp_device.c +index 9ef5741..42236cb 100644 +--- a/src/ifp_device.c ++++ b/src/ifp_device.c +@@ -824,7 +824,7 @@ gchar *npath; + + + void +-directory_chooser(char * title, GtkWidget * parent, char * directory) { ++directory_chooser(char * title, GtkWidget * parent, char * directory, size_t directory_len) { + + GtkWidget * dialog; + const gchar * selected_directory; +@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) { + gtk_widget_destroy(dialog); + } + +- arr_strlcpy(directory, selected_directory); ++ g_strlcpy(directory, selected_directory, directory_len); + g_free(utf8); + } + +@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) { + + void + local_path_selected_cb(GtkButton * button, gpointer data) { +- directory_chooser(_("Please select a local path."), aifp_window, dest_dir); ++ directory_chooser(_("Please select a local path."), aifp_window, dest_dir, sizeof dest_dir); + gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir); + } +
