darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-12-04 10:43:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8210810: Escaped character at specific position in argument file is not handled properly

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Bo Zhang 2018-09-28 13:15:01 -07:00 committed by Henry Jen
parent cc4436e2b9
commit 3a0b2d59ad
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java.base/share/native/libjli/args.c
View File

@ -263,6 +263,8 @@ static char* nextToken(__ctx_args *pctx) {
}
JLI_List_addSubstring(pctx->parts, anchor, nextc - anchor);
pctx->state = IN_ESCAPE;
// anchor after backslash character
anchor = nextc + 1;
break;
case '\'':
case '"':

19
test/jdk/tools/launcher/ArgFileSyntax.java
View File

@ -23,7 +23,7 @@
/**
* @test
* @bug 8027634
* @bug 8027634 8210810
* @summary Verify syntax of argument file
* @build TestHelper
* @run main ArgFileSyntax
@ -40,6 +40,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ArgFileSyntax extends TestHelper {
// Buffer size in args.c readArgFile() method
private static final int ARG_FILE_PARSER_BUF_SIZE = 4096;
private File createArgFile(List<String> lines) throws IOException {
File argFile = new File("argfile");
argFile.delete();
@ -186,7 +189,7 @@ public class ArgFileSyntax extends TestHelper {
String bag = "-Dgarbage=";
String ver = "-version";
// a token 8192 long
char[] data = new char[8192 - bag.length()];
char[] data = new char[2*ARG_FILE_PARSER_BUF_SIZE - bag.length()];
Arrays.fill(data, 'O');
List<String> scratch = new ArrayList<>();
scratch.add("-Xmx32m");
@ -194,13 +197,23 @@ public class ArgFileSyntax extends TestHelper {
scratch.add(ver);
rv.add(Collections.nCopies(2, scratch));
data = new char[8192 + 1024];
data = new char[2*ARG_FILE_PARSER_BUF_SIZE + 1024];
Arrays.fill(data, 'O');
scratch = new ArrayList<>();
scratch.add(bag + String.valueOf(data));
scratch.add(ver);
rv.add(Collections.nCopies(2, scratch));
// 8210810: position escaping character at boundary
// reserve space for quote and backslash
data = new char[ARG_FILE_PARSER_BUF_SIZE - bag.length() - 2];
Arrays.fill(data, 'O');
scratch = new ArrayList<>();
String filling = String.valueOf(data);
scratch.add(bag + "'" + filling + "\\\\aaa\\\\'");
scratch.add(ver);
rv.add(List.of(scratch, List.of(bag + filling + "\\aaa\\", ver)));
return rv;
}