From: Joas Schilling <coding@schilljs.com>
Date: Thu, 20 Jun 2019 13:23:06 +0000 (+0200)
Subject: Fall back to black for non-color values
X-Git-Tag: v16.0.2RC1~14^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1066e4a95224fb334b2c1efe555e6586621173bc;p=nextcloud-server.git

Fall back to black for non-color values

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
index bbf4e61c60c..b956f724ad8 100644
--- a/core/Controller/SvgController.php
+++ b/core/Controller/SvgController.php
@@ -111,6 +111,7 @@ class SvgController extends Controller {
 	 *
 	 * @param string $path
 	 * @param string $color
+	 * @param string $fileName
 	 * @return DataDisplayResponse|NotFoundResponse
 	 */
 	private function getSvg(string $path, string $color, string $fileName) {
diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php
index 9cd4f8bca10..dd83ce78775 100644
--- a/lib/private/Template/IconsCacher.php
+++ b/lib/private/Template/IconsCacher.php
@@ -184,6 +184,11 @@ class IconsCacher {
 	 * @return string
 	 */
 	public function colorizeSvg($svg, $color): string {
+		if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
+			// Prevent not-sane colors from being written into the SVG
+			$color = '000';
+		}
+
 		// add fill (fill is not present on black elements)
 		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
 		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);