hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into mergeback-2018-10-11

Browse Source
This commit is contained in:
Tom Hvitved
2018-10-11 14:36:44 +02:00
parent 95abf557ac 68dae60927
commit b29b314f4e
321 changed files with 27787 additions and 3927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.java
View File

@@ -1,11 +1,10 @@
FileInputStream fis = null;
FileOutputStream fos = null;
try {
fis = new FileInputStream(new File("may_not_exist.txt"));
// read from input stream
fos = new FileOutputStream(new File("may_not_exist.txt"));
} catch (FileNotFoundException e) {
// ask the user and try again
} catch (IOException e) {
// more serious, abort
} finally {
if (fis!=null) { try { fis.close(); } catch (IOException e) { /*ignore*/ } }
if (fos!=null) { try { fos.close(); } catch (IOException e) { /*ignore*/ } }
}

8
java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.qhelp
View File

@@ -45,7 +45,13 @@ than one of the <code>catch</code> clauses, only the first matching clause is ex
</recommendation>
<example>
<p>In the following example, the second <code>catch</code> clause is unreachable, and can be removed.</p>
<p>
In the following example, the second <code>catch</code> clause is unreachable.
The code is incomplete because a <code>FileOutputStream</code> is opened but
no methods are called to write to the stream. Such methods typically throw
<code>IOException</code>s, which would make the second <code>catch</code> clause
reachable.
</p>
<sample src="PartiallyMaskedCatch.java" />

5
java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.ql
View File

@@ -47,7 +47,10 @@ RefType getAThrownExceptionType(TryStmt t) {
t.getBlock() = call.getEnclosingStmt().getParent*() or
t.getAResourceDecl() = call.getEnclosingStmt()
|
call.getCallee().getAnException() = e and
(
call.getCallee().getAnException() = e or
call.(GenericCall).getATypeArgument(call.getCallee().getAnException().getType()) = e.getType()
) and
not caughtInside(t, call.getEnclosingStmt(), e.getType()) and
result = e.getType()
) or

12
java/ql/test/.project Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>semmlecode-tests-ql</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
<nature>com.semmle.plugin.qdt.core.qlnature</nature>
</natures>
</projectDescription>

10
java/ql/test/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatchTest.java
View File

@@ -68,6 +68,14 @@ public class PartiallyMaskedCatchTest {
} catch (IOException e) {
// reachable: IOException is thrown by getClosableThing()
}
try (ClosableThing thing = new ClosableThing()) {
genericThrowingMethod(IOException.class);
} catch (ExceptionA e) {
// reachable: ExceptionA is thrown by implicit invocation of CloseableThing.close()
} catch (IOException e) {
// reachable: IOException is thrown by invocation of genericThrowingMethod(IOException.class)
}
}
public static ClosableThing getClosableThing() throws IOException {
@@ -94,4 +102,6 @@ public class PartiallyMaskedCatchTest {
throws ClassNotFoundException,
NoSuchMethodException, InstantiationException, IllegalAccessException,
InvocationTargetException {}
public static <E extends Exception> void genericThrowingMethod(Class<E> c) throws E {}
}