jenkins-bot has submitted this change and it was merged.
Change subject: Use wfShellExec in MimeMagic
......................................................................
Use wfShellExec in MimeMagic
This avoids shell execution with backticks
Change-Id: I37ca19f4b19a3a7f2834a234051e4044653fcfb1
---
M includes/MimeMagic.php
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
IAlex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 24d803b..1627b3d 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -876,9 +876,8 @@
$m = null;
if ( $wgMimeDetectorCommand ) {
- // @todo FIXME: Use wfShellExec
- $fn = wfEscapeShellArg( $file );
- $m = `$wgMimeDetectorCommand $fn`;
+ $args = wfEscapeShellArg( $file );
+ $m = wfShellExec( "$wgMimeDetectorCommand $args" );
} elseif ( function_exists( "finfo_open" ) && function_exists(
"finfo_file" ) ) {
# This required the fileinfo extension by PECL,
--
To view, visit https://gerrit.wikimedia.org/r/60201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37ca19f4b19a3a7f2834a234051e4044653fcfb1
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
