From 82e16bd24ef847b86321f25a8dd416c813b970f9 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 30 May 2018 11:56:27 +0200
Subject: buildmaster/todos.php: base64_encode for dot to avoid bash mantraps

---
 buildmaster/todos.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'buildmaster/todos.php')

diff --git a/buildmaster/todos.php b/buildmaster/todos.php
index d6ad5f8..9785cf4 100644
--- a/buildmaster/todos.php
+++ b/buildmaster/todos.php
@@ -47,19 +47,18 @@ if (isset($_GET["graph"])) {
       $edges=$edges . "\"" . $link["depending_on"] . "\" -> \"" . $link["dependent"] . "\";\n";
   }
 
-  $knots = str_replace("\$","\\\$",$knots);
-  $edges = str_replace("\$","\\\$",$edges);
-
   header ("Content-type: image/png");
   passthru(
-    "dot -Tpng -o/dev/stdout /dev/stdin <<EOF\n" .
-    "digraph dependencies {\n" .
-    "rankdir=LR;\n" .
-    "fontname=dejavu;\n" .
-    $knots .
-    $edges .
-    "}\n" .
-    "EOF\n"
+    "echo \"" . base64_encode(
+      "digraph dependencies {\n" .
+      "rankdir=LR;\n" .
+      "fontname=dejavu;\n" .
+      $knots .
+      $edges .
+      "}\n"
+    ) . "\" | " .
+    "base64 -d | " .
+    "dot -Tpng -o/dev/stdout /dev/stdin"
   );
 
 } else { // isset($_GET["graph"])
-- 
cgit v1.2.3