Merge pull request #59 from vlakoff/quotes

Add quotes around python and dot path if needed

1 files changed, 7 insertions, 0 deletions

diff --git a/index.php b/index.php
index d89dc85..1dff2d1 100644
--- a/index.php
+++ b/index.php
@@ -157,6 +157,13 @@ try {
 
             $filename = Webgrind_Config::storageDir().$dataFile.'-'.$showFraction.Webgrind_Config::$preprocessedSuffix.'.'.Webgrind_Config::$graphImageType;
             if (!file_exists($filename)) {
+                // Add enclosing quotes if needed
+                foreach (array('pythonExecutable', 'dotExecutable') as $exe) {
+                    $item =& Webgrind_Config::$$exe;
+                    if (strpos($item, ' ') !== false && !preg_match('/^".+"$/', $item)) {
+                        $item = '"'.$item.'"';
+                    }
+                }
                 shell_exec(Webgrind_Config::$pythonExecutable.' library/gprof2dot.py -n '.$showFraction.' -f callgrind '.Webgrind_Config::xdebugOutputDir().''.$dataFile.' | '.Webgrind_Config::$dotExecutable.' -T'.Webgrind_Config::$graphImageType.' -o ' . $filename);
             }
             readfile($filename);