archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

Remove untrusted input to exec

Browse Source
This commit is contained in:
Peter Braden 2019-03-20 08:45:23 +00:00
parent cfc96ba0af
commit 81a4b86201
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/find-opencv.js
View File

@ -2,13 +2,13 @@
var exec = require("child_process").exec; var exec = require("child_process").exec;
var fs = require("fs"); var fs = require("fs");
var flag = process.argv[2] || "--exists"; var flag = "--exists";
// Normally |pkg-config opencv ...| could report either OpenCV 2.x or OpenCV 3.y // Normally |pkg-config opencv ...| could report either OpenCV 2.x or OpenCV 3.y
// depending on what is installed. To enable both 2.x and 3.y to co-exist on // depending on what is installed. To enable both 2.x and 3.y to co-exist on
// the same machine, the opencv.pc for 3.y can be installed as opencv3.pc and // the same machine, the opencv.pc for 3.y can be installed as opencv3.pc and
// then selected by |export PKG_CONFIG_OPENCV3=1| before building node-opencv. // then selected by |export PKG_CONFIG_OPENCV3=1| before building node-opencv.
var opencv = process.env.PKG_CONFIG_OPENCV3 === "1" ? "opencv3" : '"opencv >= 2.3.1"'; var opencv = process.env.PKG_CONFIG_OPENCV3 === "1" ? "opencv3" : ' "opencv >= 2.3.1"';
function main(){ function main(){
//Try using pkg-config, but if it fails and it is on Windows, try the fallback //Try using pkg-config, but if it fails and it is on Windows, try the fallback
@ -18,7 +18,7 @@ function main(){
fallback(); fallback();
} }
else{ else{
throw new Error("ERROR: failed to run: pkg-config", opencv, flag); throw new Error("ERROR: failed to run: pkg-config" + opencv + " " + flag + " - Is OpenCV installed?");
} }
} }
else{ else{