update some alert-messages based on review feedback

Author: erik-krogh

cpp/ql/src/Critical/FileMayNotBeClosed.ql

@@ -164,4 +164,4 @@ where
     fopenVariableReaches(v, def, ret) and
     ret.getAChild*() = v.getAnAccess()
   )
-select def, "This file open may not be closed at $@.", ret, "this exit point"
+select def, "The file opened here may not be closed at $@.", ret, "this exit point"

cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql

@@ -123,5 +123,5 @@ where
   conf.hasFlowPath(source, sink) and
   isFlowSource(source.getNode(), sourceType)
 select sink.getNode(), source, sink,
-  "An array indexing expression depends on $@, potentially causing an invalid access.",
+  "An array indexing expression depends on a $@ that might be outside the bounds of the array.",
   source.getNode(), sourceType

cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql

@@ -86,5 +86,5 @@ class TaintSource extends VariableAccess {
 
 from TaintSource source, VariableAccess sink
 where source.reaches(sink)
-select sink, "$@ that may not be null terminated flows to a string operation.", source,
-  "User-provided value"
+select sink, "String operation depends on a $@ that may not be null terminated.", source,
+  "user-provided value"

cpp/ql/test/query-tests/Critical/FileClosed/FileMayNotBeClosed.expected

@@ -1,3 +1,3 @@
-| file.c:8:15:8:19 | call to fopen | This file open may not be closed at $@. | file.c:12:13:12:19 | return ... | this exit point |
-| file.c:18:15:18:19 | call to fopen | This file open may not be closed at $@. | file.c:22:13:22:24 | return ... | this exit point |
-| file.c:66:5:66:34 | ... = ... | This file open may not be closed at $@. | file.c:74:5:74:13 | return ... | this exit point |
+| file.c:8:15:8:19 | call to fopen | The file opened here may not be closed at $@. | file.c:12:13:12:19 | return ... | this exit point |
+| file.c:18:15:18:19 | call to fopen | The file opened here may not be closed at $@. | file.c:22:13:22:24 | return ... | this exit point |
+| file.c:66:5:66:34 | ... = ... | The file opened here may not be closed at $@. | file.c:74:5:74:13 | return ... | this exit point |

cpp/ql/test/query-tests/Likely Bugs/Memory Management/ImproperNullTermination/ImproperNullTerminationTainted.expected

@@ -1,2 +1,2 @@
-| test.cpp:466:10:466:15 | buffer | $@ that may not be null terminated flows to a string operation. | test.cpp:465:18:465:23 | buffer | User-provided value |
-| test.cpp:481:10:481:15 | buffer | $@ that may not be null terminated flows to a string operation. | test.cpp:480:9:480:14 | buffer | User-provided value |
+| test.cpp:466:10:466:15 | buffer | String operation depends on a $@ that may not be null terminated. | test.cpp:465:18:465:23 | buffer | user-provided value |
+| test.cpp:481:10:481:15 | buffer | String operation depends on a $@ that may not be null terminated. | test.cpp:480:9:480:14 | buffer | user-provided value |

cpp/ql/test/query-tests/Security/CWE/CWE-129/SAMATE/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected

@@ -5,4 +5,4 @@ nodes
 | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | semmle.label | data |
 subpaths
 #select
-| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | An array indexing expression depends on $@, potentially causing an invalid access. | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | String read by fgets |
+| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | An array indexing expression depends on a $@ that might be outside the bounds of the array. | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | String read by fgets |

cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected

@@ -21,6 +21,6 @@ nodes
 | test1.c:53:15:53:15 | j | semmle.label | j |
 subpaths
 #select
-| test1.c:18:16:18:16 | i | test1.c:8:16:8:19 | argv | test1.c:18:16:18:16 | i | An array indexing expression depends on $@, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | a command-line argument |
-| test1.c:33:11:33:11 | i | test1.c:8:16:8:19 | argv | test1.c:33:11:33:11 | i | An array indexing expression depends on $@, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | a command-line argument |
-| test1.c:53:15:53:15 | j | test1.c:8:16:8:19 | argv | test1.c:53:15:53:15 | j | An array indexing expression depends on $@, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | a command-line argument |
+| test1.c:18:16:18:16 | i | test1.c:8:16:8:19 | argv | test1.c:18:16:18:16 | i | An array indexing expression depends on a $@ that might be outside the bounds of the array. | test1.c:8:16:8:19 | argv | a command-line argument |
+| test1.c:33:11:33:11 | i | test1.c:8:16:8:19 | argv | test1.c:33:11:33:11 | i | An array indexing expression depends on a $@ that might be outside the bounds of the array. | test1.c:8:16:8:19 | argv | a command-line argument |
+| test1.c:53:15:53:15 | j | test1.c:8:16:8:19 | argv | test1.c:53:15:53:15 | j | An array indexing expression depends on a $@ that might be outside the bounds of the array. | test1.c:8:16:8:19 | argv | a command-line argument |

cpp/ql/test/query-tests/Security/CWE/CWE-772/semmle/tests-file/FileMayNotBeClosed.expected

@@ -1,14 +1,14 @@
-| test.cpp:59:2:59:30 | ... = ... | This file open may not be closed at $@. | test.cpp:64:1:64:1 | return ... | this exit point |
-| test.cpp:69:12:69:16 | call to fopen | This file open may not be closed at $@. | test.cpp:73:3:73:9 | return ... | this exit point |
-| test.cpp:85:2:85:30 | ... = ... | This file open may not be closed at $@. | test.cpp:89:1:89:1 | return ... | this exit point |
-| test.cpp:115:2:115:17 | ... = ... | This file open may not be closed at $@. | test.cpp:121:3:121:9 | return ... | this exit point |
-| test.cpp:115:2:115:17 | ... = ... | This file open may not be closed at $@. | test.cpp:124:1:124:1 | return ... | this exit point |
-| test.cpp:118:2:118:17 | ... = ... | This file open may not be closed at $@. | test.cpp:121:3:121:9 | return ... | this exit point |
-| test.cpp:221:12:221:16 | call to fopen | This file open may not be closed at $@. | test.cpp:225:1:225:1 | return ... | this exit point |
-| test.cpp:240:12:240:16 | call to fopen | This file open may not be closed at $@. | test.cpp:249:1:249:1 | return ... | this exit point |
-| test.cpp:253:12:253:16 | call to fopen | This file open may not be closed at $@. | test.cpp:260:1:260:1 | return ... | this exit point |
-| test.cpp:276:12:276:16 | call to fopen | This file open may not be closed at $@. | test.cpp:281:3:281:9 | return ... | this exit point |
-| test.cpp:299:12:299:16 | call to fopen | This file open may not be closed at $@. | test.cpp:305:1:305:1 | return ... | this exit point |
-| test.cpp:310:12:310:16 | call to fopen | This file open may not be closed at $@. | test.cpp:323:1:323:1 | return ... | this exit point |
-| test.cpp:356:12:356:16 | call to fopen | This file open may not be closed at $@. | test.cpp:369:1:369:1 | return ... | this exit point |
-| test.cpp:384:15:384:19 | call to fopen | This file open may not be closed at $@. | test.cpp:394:1:394:1 | return ... | this exit point |
+| test.cpp:59:2:59:30 | ... = ... | The file opened here may not be closed at $@. | test.cpp:64:1:64:1 | return ... | this exit point |
+| test.cpp:69:12:69:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:73:3:73:9 | return ... | this exit point |
+| test.cpp:85:2:85:30 | ... = ... | The file opened here may not be closed at $@. | test.cpp:89:1:89:1 | return ... | this exit point |
+| test.cpp:115:2:115:17 | ... = ... | The file opened here may not be closed at $@. | test.cpp:121:3:121:9 | return ... | this exit point |
+| test.cpp:115:2:115:17 | ... = ... | The file opened here may not be closed at $@. | test.cpp:124:1:124:1 | return ... | this exit point |
+| test.cpp:118:2:118:17 | ... = ... | The file opened here may not be closed at $@. | test.cpp:121:3:121:9 | return ... | this exit point |
+| test.cpp:221:12:221:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:225:1:225:1 | return ... | this exit point |
+| test.cpp:240:12:240:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:249:1:249:1 | return ... | this exit point |
+| test.cpp:253:12:253:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:260:1:260:1 | return ... | this exit point |
+| test.cpp:276:12:276:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:281:3:281:9 | return ... | this exit point |
+| test.cpp:299:12:299:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:305:1:305:1 | return ... | this exit point |
+| test.cpp:310:12:310:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:323:1:323:1 | return ... | this exit point |
+| test.cpp:356:12:356:16 | call to fopen | The file opened here may not be closed at $@. | test.cpp:369:1:369:1 | return ... | this exit point |
+| test.cpp:384:15:384:19 | call to fopen | The file opened here may not be closed at $@. | test.cpp:394:1:394:1 | return ... | this exit point |