From: Darian Anthony Patrick <dpatrick@wikimedia.org>
Date: Wed, 12 Aug 2015 19:47:36 +0000 (-0700)
Subject: Avoid exposure of local path in PNG thumbnails
X-Git-Tag: 1.31.0-rc.0~9366
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=fd0ca2f3a02c1b54be1bd16b9d22546428176ce6;p=lhc%2Fweb%2Fwiklou.git

Avoid exposure of local path in PNG thumbnails

Bug: T108616
Change-Id: I952068d2d175d71f86dec0dbb92af5a122c05a49
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 692e5a644f..faf40b3029 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -161,6 +161,8 @@ class BitmapHandler extends TransformationalImageHandler {
 			( $params['comment'] !== ''
 				? array( '-set', 'comment', $this->escapeMagickProperty( $params['comment'] ) )
 				: array() ),
+			// T108616: Avoid exposure of local file path
+			array( '+set', 'Thumb::URI' ),
 			array( '-depth', 8 ),
 			$sharpen,
 			array( '-rotate', "-$rotation" ),