Skip to content

Commit b30f772

Browse files
Pantheon Automationgreg-1-anderson
Pantheon Automation
authored andcommitted
Update to Drupal 7.75. For more information, see https://www.drupal.org/project/drupal/releases/7.75
1 parent eaa2127 commit b30f772

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

CHANGELOG.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Drupal 7.75, 2020-11-26
2+
-----------------------
3+
- Fixed security issues:
4+
- SA-CORE-2020-013
5+
16
Drupal 7.74, 2020-11-17
27
-----------------------
38
- Fixed security issues:

includes/bootstrap.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* The current system version.
1010
*/
11-
define('VERSION', '7.74');
11+
define('VERSION', '7.75');
1212

1313
/**
1414
* Core API compatibility.

modules/system/system.tar.inc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1788,7 +1788,7 @@ class Archive_Tar
17881788

17891789
// ----- Extract the properties
17901790
$v_header['filename'] = rtrim($v_data['filename'], "\0");
1791-
if ($this->_maliciousFilename($v_header['filename'])) {
1791+
if ($this->_isMaliciousFilename($v_header['filename'])) {
17921792
$this->_error(
17931793
'Malicious .tar detected, file "' . $v_header['filename'] .
17941794
'" will not install in desired directory tree'
@@ -1858,9 +1858,9 @@ class Archive_Tar
18581858
*
18591859
* @return bool
18601860
*/
1861-
private function _maliciousFilename($file)
1861+
private function _isMaliciousFilename($file)
18621862
{
1863-
if (strpos($file, 'phar://') === 0) {
1863+
if (strpos($file, '://') !== false) {
18641864
return true;
18651865
}
18661866
if (strpos($file, '../') !== false || strpos($file, '..\\') !== false) {
@@ -1896,7 +1896,7 @@ class Archive_Tar
18961896

18971897
$v_filename = rtrim(substr($v_filename, 0, $v_filesize), "\0");
18981898
$v_header['filename'] = $v_filename;
1899-
if ($this->_maliciousFilename($v_filename)) {
1899+
if ($this->_isMaliciousFilename($v_filename)) {
19001900
$this->_error(
19011901
'Malicious .tar detected, file "' . $v_filename .
19021902
'" will not install in desired directory tree'

0 commit comments

Comments
 (0)