Skip to content

Commit cde8aca

Browse files
Roman Marchenkognu-andrew
authored andcommitted
8069389: CompilerOracle prefix wildcarding is broken for long strings
Replace strcpy with memmove Reviewed-by: andrew Backport-of: 01ec6950020268a375eb5330373e6c0813f3a924
1 parent c1c8064 commit cde8aca

File tree

2 files changed

+80
-1
lines changed

2 files changed

+80
-1
lines changed

hotspot/src/share/vm/compiler/compilerOracle.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,8 @@ static MethodMatcher::Mode check_mode(char name[], const char*& error_msg) {
493493
int match = MethodMatcher::Exact;
494494
while (name[0] == '*') {
495495
match |= MethodMatcher::Suffix;
496-
strcpy(name, name + 1);
496+
// Copy remaining string plus NUL to the beginning
497+
memmove(name, name + 1, strlen(name + 1) + 1);
497498
}
498499

499500
if (strcmp(name, "*") == 0) return MethodMatcher::Any;
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/*
2+
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.io.PrintWriter;
25+
import java.io.File;
26+
27+
import com.oracle.java.testlibrary.*;
28+
29+
/*
30+
* @test TestCompileCommand
31+
* @bug 8069389
32+
* @summary "Regression tests of -XX:CompileCommand"
33+
* @library /testlibrary
34+
* @run main TestCompileCommand
35+
*/
36+
37+
public class TestCompileCommand {
38+
39+
private static final String[][] ARGUMENTS = {
40+
{
41+
"-XX:CompileCommand=print,*01234567890123456789012345678901234567890123456789,*0123456789012345678901234567890123456789",
42+
"-version"
43+
}
44+
};
45+
46+
private static final String[][] OUTPUTS = {
47+
{
48+
"print *01234567890123456789012345678901234567890123456789.*0123456789012345678901234567890123456789"
49+
}
50+
};
51+
52+
private static void verifyValidOption(String[] arguments, String[] expected_outputs) throws Exception {
53+
ProcessBuilder pb;
54+
OutputAnalyzer out;
55+
56+
pb = ProcessTools.createJavaProcessBuilder(arguments);
57+
out = new OutputAnalyzer(pb.start());
58+
59+
for (String expected_output : expected_outputs) {
60+
out.shouldContain(expected_output);
61+
}
62+
63+
out.shouldNotContain("CompileCommand: An error occured during parsing");
64+
out.shouldHaveExitValue(0);
65+
}
66+
67+
public static void main(String[] args) throws Exception {
68+
69+
if (ARGUMENTS.length != OUTPUTS.length) {
70+
throw new RuntimeException("Test is set up incorrectly: length of arguments and expected outputs for type (1) options does not match.");
71+
}
72+
73+
// Check if type (1) options are parsed correctly
74+
for (int i = 0; i < ARGUMENTS.length; i++) {
75+
verifyValidOption(ARGUMENTS[i], OUTPUTS[i]);
76+
}
77+
}
78+
}

0 commit comments

Comments
 (0)