Skip to content

GROOVY-8056: GroovyCodeSource(URL) can leak a file handler #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jwagenleitner wants to merge 1 commit into from
Closed

GROOVY-8056: GroovyCodeSource(URL) can leak a file handler #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/main/groovy/lang/GroovyCodeSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,7 @@ public GroovyCodeSource(URL url) {
this.name = url.toExternalForm();
this.codeSource = new CodeSource(url, (java.security.cert.Certificate[]) null);
try {
String contentEncoding = url.openConnection().getContentEncoding();
if (contentEncoding != null) {
this.scriptText = ResourceGroovyMethods.getText(url, contentEncoding);
} else {
this.scriptText = ResourceGroovyMethods.getText(url); // falls-back on default encoding
}
this.scriptText = ResourceGroovyMethods.getText(url); // default encoding
} catch (IOException e) {
throw new RuntimeException("Impossible to read the text content from " + name, e);
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/groovy/util/GroovyScriptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,7 @@ public Class loadScriptByName(String scriptName) throws ResourceException, Scrip
try {
if (isSourceNewer(entry)) {
try {
String encoding = conn.getContentEncoding() != null ? conn.getContentEncoding() : config.getSourceEncoding();
String content = IOGroovyMethods.getText(conn.getInputStream(), encoding);
String content = IOGroovyMethods.getText(conn.getInputStream(), config.getSourceEncoding());
clazz = groovyLoader.parseClass(content, path);
} catch (IOException e) {
throw new ResourceException(e);
Expand Down
4 changes: 0 additions & 4 deletions src/test/groovy/util/GroovyScriptEngineReloadingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,6 @@ class GroovyScriptEngineReloadingTest extends GroovyTestCase {
}

class MapUrlConnection extends URLConnection {
String getContentEncoding() {
return CHARSET
}

Object getContent() throws IOException {
return super.content
}
Expand Down