LUGG-1162 Merge branch 'release'

CHANGELOG.txt

@@ -1,3 +1,7 @@
+Drupal 7.63, 2019-01-16
+-----------------------
+- Fixed a fatal error for some Drush users introduced by SA-CORE-2019-002.
+
 Drupal 7.62, 2019-01-15
 -----------------------
 - Fixed security issues:

LUGGAGE_CHANGELOG.txt

@@ -2,6 +2,11 @@ How to read this changelog:
 
 The LUGG- prefix refers to JIRA issue numbers; the # prefix refers to GitHub issue numbers.
 
+Luggage 3.6.4, 2019-01-17
+Drupal 7.63, 2019-01-16
+-------------------------
+- LUGG-1162 - Drupal 7.63
+
 Luggage 3.6.3, 2019-01-16
 Drupal 7.62, 2019-01-15
 -------------------------

LUGGAGE_ISU_CHANGELOG.txt

@@ -6,9 +6,15 @@ The Luggage_ISU version number shows the upstream Luggage version it is based on
 as well as the Luggage_ISU version. For example, Luggage_ISU 3.5.0-5.0 is based
 on the upstream Luggage release 3.5.0.
 
+Luggage_ISU 3.6.4-6.4, 2019-01-17
+Drupal 7.63, 2019-01-16
+-------------------------
+Merged with upstream Luggage 3.6.4
+
 Luggage_ISU 3.6.3-6.3, 2019-01-16
 Drupal 7.62, 2019-01-15
 -------------------------
+Merged with upstream Luggage 3.6.3
 - LUGG-1161 - Drupal 7.62 SA-CORE-2019-001 SA-CORE-2019-002
 
 Luggage_ISU 3.6.2-6.2, 2019-01-04

LUGGAGE_ISU_VERSION.php

@@ -1,3 +1,3 @@
 <?php
 
-$version = "6.3";
+$version = "6.4";

LUGGAGE_VERSION.php

@@ -1,3 +1,3 @@
 <?php
 
-$version = "3.6.3";
+$version = "3.6.4";

includes/bootstrap.inc

@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.62');
+define('VERSION', '7.63');
 
 /**
  * Core API compatibility.

misc/typo3/drupal-security/PharExtensionInterceptor.php

@@ -22,7 +22,6 @@ class PharExtensionInterceptor implements Assertable {
    *
    * @param string $path
    *   The path of the phar file to check.
-   *
    * @param string $command
    *   The command being carried out.
    *
@@ -46,6 +45,8 @@ public function assert($path, $command) {
   }
 
   /**
+   * Determines if a path has a .phar extension or invoked execution.
+   *
    * @param string $path
    *   The path of the phar file to check.
    *
@@ -62,8 +63,13 @@ private function baseFileContainsPharExtension($path) {
     // not not have .phar extension then this should be allowed. For
     // example, some CLI tools recommend removing the extension.
     $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-    $caller = array_pop($backtrace);
-    if (isset($caller['file']) && $baseFile === $caller['file']) {
+    // Find the last entry in the backtrace containing a 'file' key as
+    // sometimes the last caller is executed outside the scope of a file. For
+    // example, this occurs with shutdown functions.
+    do {
+      $caller = array_pop($backtrace);
+    } while (empty($caller['file']) && !empty($backtrace));
+    if (isset($caller['file']) && $baseFile === Helper::determineBaseFile($caller['file'])) {
       return TRUE;
     }
     $fileExtension = pathinfo($baseFile, PATHINFO_EXTENSION);