rtyler
/
avatar-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

155: Fixed the check for an escaped expression in eval mode. 

Reviewed-by: asquare
This commit is contained in:
Kinsley Wong 2014-01-09 14:29:23 -08:00
parent 08d7b74e2c
commit 17dcbb0cff
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -284,6 +284,7 @@
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-child-process-fork-exec-argv.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-child-process-fork-exec-path.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-child-process-fork-net2.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-cli-eval.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-cluster-http-pipe.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-dgram-address.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-dgram-broadcast-multi-process.js"/>
@ -381,6 +382,7 @@
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-child-process-fork-exec-argv.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-child-process-fork-exec-path.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-child-process-fork-net2.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-cli-eval.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-cluster-http-pipe.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-dgram-address.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-dgram-broadcast-multi-process.js"/>

11
patches/test/simple/test-cli-eval.js.patch Normal file
View File

@ -0,0 +1,11 @@
--- ../nodejs/test/simple/test-cli-eval.js 2013-12-19 22:22:54.418398000 -0800
+++ test/simple/test-cli-eval.js 2014-01-09 14:11:02.036472900 -0800
@@ -28,7 +28,7 @@
var common = require('../common.js'),
assert = require('assert'),
child = require('child_process'),
- nodejs = '"' + process.execPath + '"';
+ nodejs = process.execPath;
// replace \ by / because windows uses backslashes in paths, but they're still

1
project.properties
View File

@ -132,6 +132,7 @@ source.test.simple.list = \
test-child-process-stdio-inherit.js \
test-child-process-stdio.js \
test-child-process-stdout-flush.js \
test-cli-eval.js \
test-cluster-basic.js \
test-cluster-bind-twice-v1.js \
test-cluster-dgram-1.js \

2
src/main/java/com/oracle/avatar/js/Server.java
View File

@ -301,7 +301,7 @@ public final class Server {
}
final String evalString = args[++i];
holder.setEvalString(evalString);
if ("\\-".startsWith(evalString)) {
if (evalString.startsWith("\\-")) {
holder.setEvalString(evalString.substring(1));
}
} else {