a few more queries

Author: erik-krogh

java/ql/src/Language Abuse/UselessNullCheck.ql

@@ -24,7 +24,7 @@ where
     then msg = "This check is useless. $@ cannot be null at this check, since it is guarded by $@."
     else
       if reason != e
-      then msg = "This check is useless. $@ cannot be null this check, since $@ always is non-null."
+      then msg = "This check is useless. $@ cannot be null at this check, since $@ always is non-null."
       else msg = "This check is useless, since $@ always is non-null."
   )
 select guard, msg, e, e.toString(), reason, reason.toString()

java/ql/src/Security/CWE/CWE-940/AndroidIntentRedirection.ql

@@ -20,5 +20,5 @@ import DataFlow::PathGraph
 from DataFlow::PathNode source, DataFlow::PathNode sink, IntentRedirectionConfiguration conf
 where conf.hasFlowPath(source, sink)
 select sink.getNode(), source, sink,
-  "Arbitrary Android activities or services can be started from $@.", source.getNode(),
+  "Arbitrary Android activities or services can be started from a $@.", source.getNode(),
   "user-provided value"

java/ql/test/query-tests/UselessNullCheck/UselessNullCheck.expected

@@ -1,8 +1,8 @@
-| A.java:4:9:4:17 | ... == ... | This check is useless. $@ cannot be null this check, since $@ always is non-null. | A.java:4:9:4:9 | o | o | A.java:3:16:3:27 | new Object(...) | new Object(...) |
-| A.java:5:9:5:17 | ... != ... | This check is useless. $@ cannot be null this check, since $@ always is non-null. | A.java:5:9:5:9 | o | o | A.java:3:16:3:27 | new Object(...) | new Object(...) |
-| A.java:9:11:9:19 | ... == ... | This check is useless. $@ cannot be null this check, since $@ always is non-null. | A.java:9:11:9:11 | e | e | A.java:8:23:8:23 | e | e |
+| A.java:4:9:4:17 | ... == ... | This check is useless. $@ cannot be null at this check, since $@ always is non-null. | A.java:4:9:4:9 | o | o | A.java:3:16:3:27 | new Object(...) | new Object(...) |
+| A.java:5:9:5:17 | ... != ... | This check is useless. $@ cannot be null at this check, since $@ always is non-null. | A.java:5:9:5:9 | o | o | A.java:3:16:3:27 | new Object(...) | new Object(...) |
+| A.java:9:11:9:19 | ... == ... | This check is useless. $@ cannot be null at this check, since $@ always is non-null. | A.java:9:11:9:11 | e | e | A.java:8:23:8:23 | e | e |
 | A.java:18:11:18:19 | ... != ... | This check is useless. $@ cannot be null at this check, since it is guarded by $@. | A.java:18:11:18:11 | a | a | A.java:16:9:16:22 | ...instanceof... | ...instanceof... |
-| A.java:31:11:31:19 | ... != ... | This check is useless. $@ cannot be null this check, since $@ always is non-null. | A.java:31:11:31:11 | x | x | A.java:29:17:29:20 | this | this |
+| A.java:31:11:31:19 | ... != ... | This check is useless. $@ cannot be null at this check, since $@ always is non-null. | A.java:31:11:31:11 | x | x | A.java:29:17:29:20 | this | this |
 | A.java:40:14:40:25 | ... != ... | This check is useless, since $@ always is non-null. | A.java:40:14:40:17 | this | this | A.java:40:14:40:17 | this | this |
 | A.java:42:9:42:17 | ... != ... | This check is useless. $@ cannot be null at this check, since it is guarded by $@. | A.java:42:9:42:9 | x | x | A.java:39:9:39:17 | ... == ... | ... == ... |
-| A.java:52:9:52:24 | ... != ... | This check is useless. $@ cannot be null this check, since $@ always is non-null. | A.java:52:9:52:16 | finalObj | finalObj | A.java:48:35:48:46 | new Object(...) | new Object(...) |
+| A.java:52:9:52:24 | ... != ... | This check is useless. $@ cannot be null at this check, since $@ always is non-null. | A.java:52:9:52:16 | finalObj | finalObj | A.java:48:35:48:46 | new Object(...) | new Object(...) |