summary refs log tree commit diff
path: root/gnu/packages/patches/newsbeuter-CVE-2017-14500.patch
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-09-18 22:38:56 +0300
committerEfraim Flashner <efraim@flashner.co.il>2017-09-18 22:38:56 +0300
commitbbcfd80a200d05b0f2c85789435bd759bad23370 (patch)
treef962a59535c38673cdaadf16c744ef52fef2def8 /gnu/packages/patches/newsbeuter-CVE-2017-14500.patch
parentf53e4ada03fc6292aa1f90fd98f19bf0d24c18d9 (diff)
downloadguix-bbcfd80a200d05b0f2c85789435bd759bad23370.tar.gz
gnu: newsbeuter: Fix CVE-2017-14500.
* gnu/packages/syndication.scm (newsbeuter)[source]: Add patch.
* gnu/packages/patches/newsbeuter-CVE-2017-14500.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/patches/newsbeuter-CVE-2017-14500.patch')
-rw-r--r--gnu/packages/patches/newsbeuter-CVE-2017-14500.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/gnu/packages/patches/newsbeuter-CVE-2017-14500.patch b/gnu/packages/patches/newsbeuter-CVE-2017-14500.patch
new file mode 100644
index 0000000000..449105e42a
--- /dev/null
+++ b/gnu/packages/patches/newsbeuter-CVE-2017-14500.patch
@@ -0,0 +1,43 @@
+https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch
+http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14500
+
+From 26f5a4350f3ab5507bb8727051c87bb04660f333 Mon Sep 17 00:00:00 2001
+From: Alexander Batischev <eual.jp@gmail.com>
+Date: Sat, 16 Sep 2017 19:31:43 +0300
+Subject: [PATCH] Work around shell code in podcast names (#598)
+
+---
+ src/pb_controller.cpp | 6 +++---
+ src/queueloader.cpp   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp
+index 09b5e897..213216cd 100644
+--- a/src/pb_controller.cpp
++++ b/src/pb_controller.cpp
+@@ -306,9 +306,9 @@ void pb_controller::play_file(const std::string& file) {
+ 	if (player == "")
+ 		return;
+ 	cmdline.append(player);
+-	cmdline.append(" \"");
+-	cmdline.append(utils::replace_all(file,"\"", "\\\""));
+-	cmdline.append("\"");
++	cmdline.append(" \'");
++	cmdline.append(utils::replace_all(file,"'", "%27"));
++	cmdline.append("\'");
+ 	stfl::reset();
+ 	LOG(LOG_DEBUG, "pb_controller::play_file: running `%s'", cmdline.c_str());
+ 	::system(cmdline.c_str());
+diff --git a/src/queueloader.cpp b/src/queueloader.cpp
+index c1dabdd8..ae725e04 100644
+--- a/src/queueloader.cpp
++++ b/src/queueloader.cpp
+@@ -130,7 +130,7 @@ std::string queueloader::get_filename(const std::string& str) {
+ 		strftime(lbuf, sizeof(lbuf), "%Y-%b-%d-%H%M%S.unknown", localtime(&t));
+ 		fn.append(lbuf);
+ 	} else {
+-		fn.append(base);
++		fn.append(utils::replace_all(base, "'", "%27"));
+ 	}
+ 	return fn;
+ }