git commit -m 'Issue #2848823 by mondrake: Imagemagick: '\''convert'\…

…'' hangs if file local path is missing' --author="mondrake <[email protected]>"
drupal-media · Feb 2, 2017 · e16b53b · e16b53b
1 parent 7e79819
commit e16b53b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/Plugin/ImageToolkit/Operation/imagemagick/Background.php b/src/Plugin/ImageToolkit/Operation/imagemagick/Background.php
@@ -24,6 +24,16 @@ class Background extends ImagemagickImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function execute(array $arguments) {
+    // Background image local path.
+    $local_path = $arguments['background_image']->getToolkit()->getSourceLocalPath();
+    if ($local_path !== '') {
+      $image_path = $this->getToolkit()->escapeShellArg($local_path);
+    }
+    else {
+      $source_path = $arguments['background_image']->getToolkit()->getSource();
+      throw new \InvalidArgumentException("Missing local path for image at {$source_path}");
+    }
+
     // Reset any gravity settings from earlier effects.
     $op = '-gravity None';
 
@@ -39,7 +49,7 @@ protected function execute(array $arguments) {
     $op .= " -extent {$w}x{$h}{$x}{$y} ";
 
     // Add the background image.
-    $op .= $this->getToolkit()->escapeShellArg($arguments['background_image']->getToolkit()->getSourceLocalPath());
+    $op .= $image_path;
 
     // Compose it with the destination.
     if ($arguments['opacity'] == 100) {

diff --git a/src/Plugin/ImageToolkit/Operation/imagemagick/ReplaceImage.php b/src/Plugin/ImageToolkit/Operation/imagemagick/ReplaceImage.php
@@ -25,6 +25,14 @@ class ReplaceImage extends ImagemagickImageToolkitOperationBase {
    */
   protected function execute(array $arguments) {
     $replacement = $arguments['replacement_image'];
+
+    // Replacement image local path.
+    $local_path = $replacement->getToolkit()->getSourceLocalPath();
+    if ($local_path === '') {
+      $source_path = $replacement->getToolkit()->getSource();
+      throw new \InvalidArgumentException("Missing local path for image at {$source_path}");
+    }
+
     $this->getToolkit()
       ->resetArguments()
       ->setSourceLocalPath($replacement->getToolkit()->getSourceLocalPath())

diff --git a/src/Plugin/ImageToolkit/Operation/imagemagick/Watermark.php b/src/Plugin/ImageToolkit/Operation/imagemagick/Watermark.php
@@ -24,8 +24,15 @@ class Watermark extends ImagemagickImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function execute(array $arguments) {
-    // Overlay image path.
-    $image_path = $this->getToolkit()->escapeShellArg($arguments['watermark_image']->getToolkit()->getSourceLocalPath());
+    // Overlay image local path.
+    $local_path = $arguments['watermark_image']->getToolkit()->getSourceLocalPath();
+    if ($local_path !== '') {
+      $image_path = $this->getToolkit()->escapeShellArg($local_path);
+    }
+    else {
+      $source_path = $arguments['watermark_image']->getToolkit()->getSource();
+      throw new \InvalidArgumentException("Missing local path for image at {$source_path}");
+    }
 
     // Set the dimensions of the overlay. Use of the scale option means that we
     // need to change the dimensions: always set them, they don't harm when the