Issue #1328: Example of problem areas and fixes.

acquia · Apr 8, 2017 · 55d6d95 · 55d6d95
1 parent 5c44a6b
commit 55d6d95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/phing/phingcludes/DrushTask.php b/phing/phingcludes/DrushTask.php
@@ -246,7 +246,7 @@ public function init() {
   public function main() {
     $command = array();
 
-    $command[] = !empty($this->bin) ? $this->bin : 'drush';
+    $command[] = !empty($this->bin) ? escapeshellarg($this->bin) : 'drush';
 
     if (!empty($this->alias)) {
       $command[] = '@' . $this->alias;

diff --git a/phing/tasks/properties.xml b/phing/tasks/properties.xml
@@ -39,7 +39,7 @@
       <exec dir="${repo.root}" command="echo '8.5.2' >> ${blt.config-files.schema-version}" checkreturn="true" logoutput="true" passthru="false" level="${blt.exec_level}"/>
     </then>
   </if>
-  <exec dir="${repo.root}" command="cat ${blt.config-files.schema-version}" outputProperty="blt.schema-version" checkreturn="true" logoutput="false" level="${blt.exec_level}"/>
+  <exec dir="${repo.root}" command="cat '${blt.config-files.schema-version}'" outputProperty="blt.schema-version" checkreturn="true" logoutput="false" level="${blt.exec_level}"/>
   <!-- Send errors to /dev/null, for environments like ACE without composer. -->
   <exec dir="${repo.root}" command="composer info acquia/blt --no-ansi 2> /dev/null | grep versions | awk '{print $4}'" outputProperty="blt.version" logoutput="false" checkreturn="true" level="${blt.exec_level}" />