Merge pull request mathjax#74 from sammarshallou/BatikExecQuoting

Changed Batik calls to use execFile instead of exec

Author: dpvc

lib/mj-page.js

@@ -31,7 +31,7 @@ var path = require('path');
 var url = require('url');
 var fmt = require('util').format;
 var jsdom = require("jsdom").jsdom;
-var exec = require('child_process').exec;
+var execFile = require('child_process').execFile;
 var speech = require('speech-rule-engine');
 var os = require('os');
 
@@ -664,7 +664,7 @@ function MakeIMG() {
 function MakePNG() {
   if (data.renderer === "PNG") {
     var synch = MathJax.Callback(function () {});  // for synchronization with MathJax
-    var batikCommand = fmt("java -jar %s -dpi %d '%s.svg'",BatikRasterizerPath,data.dpi,tmpfile);
+    var batikCommands = ['-jar', BatikRasterizerPath, '-dpi', data.dpi, tmpfile + '.svg'];
     var tmpSVG = tmpfile+".svg", tmpPNG = tmpfile+".png";
     var nodes = document.getElementsByClassName("MathJax_SVG");
     var check = function (err) {if (err) {AddError(err.message); return true}}
@@ -682,7 +682,7 @@ function MakePNG() {
       ].join("\n");
       fs.writeFile(tmpSVG,svg,function (err) {
         if (check(err)) return PNG(i-1);
-        exec(batikCommand, function (err,stdout,stderr) {
+        execFile('java', batikCommands, function (err,stdout,stderr) {
           if (check(err)) {fs.unlinkSync(tmpSVG); return PNG(i-1)}
           fs.readFile(tmpPNG,null,function (err,buffer) {
             if (!check(err)) {

lib/mj-single.js

@@ -32,7 +32,7 @@ var path = require('path');
 var url = require('url');
 var fmt = require('util').format;
 var jsdom = require('jsdom').jsdom;
-var exec = require('child_process').exec;
+var execFile = require('child_process').execFile;
 var speech = require('speech-rule-engine');
 var os = require('os');
 
@@ -461,13 +461,13 @@ function GetSVG(result) {
 function GetPNG(result) {
   var svgfile = result.svgfile; delete result.svgfile;
   if (data.png) {
-    var batikCommand = fmt("java -jar %s -dpi %d '%s.svg'",BatikRasterizerPath,data.dpi,tmpfile);
+    var batikCommands = ['-jar', BatikRasterizerPath, '-dpi', data.dpi, tmpfile + '.svg'];
     var synch = MathJax.Callback(function () {}); // for synchronization with MathJax
     var check = function (err) {if (err) {AddError(err.message); synch(); return true}}
     var tmpSVG = tmpfile+".svg", tmpPNG = tmpfile+".png";
     fs.writeFile(tmpSVG,svgfile,function (err) {
       if (check(err)) return;
-      exec(batikCommand, function (err,stdout,stderr) {
+      execFile('java', batikCommands, function (err,stdout,stderr) {
         if (check(err)) {fs.unlinkSync(tmpSVG); return}
         fs.readFile(tmpPNG,null,function (err,buffer) {
           result.png = "data:image/png;base64,"+(buffer||"").toString('base64');