Skip to content

Commit

Permalink
param array size check
Browse files Browse the repository at this point in the history
  • Loading branch information
nizarbenalla committed Oct 22, 2024
1 parent 3b71657 commit ad694a0
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -54,6 +54,7 @@
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
import com.sun.tools.javac.resources.CompilerProperties;
import com.sun.tools.javac.resources.CompilerProperties.Errors;
import com.sun.tools.javac.resources.CompilerProperties.Fragments;
import com.sun.tools.javac.tree.JCTree;
Expand Down Expand Up @@ -1401,6 +1402,7 @@ public void visitNewArray(JCNewArray tree) {
}
}
scan(tree.elems);
checkArraySize(tree.elems);
}

private void findPosition(JCTree tree, JCTree frame, List<JCAnnotation> annotations) {
Expand All @@ -1423,6 +1425,12 @@ private void setTypeAnnotationPos(List<JCAnnotation> annotations, TypeAnnotation
}
}

private void checkArraySize(List<JCExpression> tree) {
//check if attribute length exceeds maximum unsigned 16-bit value
if (tree != null && !sigOnly && (tree.size() >>> 16) > 0) {
log.warning(tree.getFirst().pos(), CompilerProperties.Warnings.ProcAnnotationArrayTooLarge);
}
}

@Override
public String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2235,6 +2235,9 @@ compiler.warn.proc.duplicate.option.name=\
compiler.warn.proc.duplicate.supported.annotation=\
Duplicate supported annotation interface ''{0}'' returned by annotation processor ''{1}''

compiler.warn.proc.annotation.array.too.large=\
Annotation array element too large, length exceeds limit of 65535

# 0: string
compiler.warn.proc.redundant.types.with.wildcard=\
Annotation processor ''{0}'' redundantly supports both ''*'' and other annotation interfaces
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
* @test
* @summary Test ParameterArraySizeLimit
* @library /tools/lib
* @run main ParameterArraySizeLimit
*/

import com.sun.source.util.JavacTask;

import javax.tools.*;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;

public class ParameterArraySizeLimit {

public static void main(String[] args) throws IOException {
JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
DiagnosticListener<? super JavaFileObject> noErrors = d -> {
// if (d.getCode().equals("compiler.err.class.public.should.be.in.file")) {
System.err.println("aight");
// }
};
JavacTask task = (JavacTask) javaCompiler.getTask(
null,
null,
noErrors,
null,
null,
Collections.singletonList(
SimpleJavaFileObject.forSource(
URI.create("myfo:/MyClass_65536.java"),
Files.readString(Paths.get("/Users/nizarbenalla/Work/jdk-repos/mainline/open/test/langtools/tools/javac/annotations/ParameterArraySizeLimit.txt")))));
task.analyze();
}
}
19 changes: 19 additions & 0 deletions test/langtools/tools/javac/annotations/ParameterArraySizeLimit.txt

Large diffs are not rendered by default.

0 comments on commit ad694a0

Please sign in to comment.