C++: Fix queries I forgot after merging github/codeql#20485 (part 2). Notice that this leaves a missing result because the guard condition logic is now interprocedural.

MathiasVP · MathiasVP · commit 12d52270f3ee · 2025-10-02T15:51:19.000+01:00
diff --git a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
@@ -84,7 +84,9 @@ module NoThrowNewErrorCheckConfig implements DataFlow::ConfigSig {
     source.asExpr() instanceof NotWrappedNoThrowAllocExpr
   }
 
-  predicate isSink(DataFlow::Node sink) { sink.asExpr() = any(GuardCondition gc).getAChild*() }
+  predicate isSink(DataFlow::Node sink) {
+    sink.asExpr().(GuardCondition).valueControlsEdge(_, _, _)
+  }
 }
 
 module NoThrowNewErrorCheckFlow = DataFlow::Global<NoThrowNewErrorCheckConfig>;
diff --git a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
@@ -3,7 +3,6 @@ WARNING: module 'DataFlow' has been deprecated and may be removed in future (Det
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:82,46-54)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:83,22-30)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:87,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:90,35-43)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:95,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:92,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:97,38-46)
 | test.cpp:24:7:24:34 | new | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:24:7:24:34 | new | StructA * |
-| test.cpp:40:17:40:38 | call to allocate_without_check | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:35:17:35:44 | new | StructA * |

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,9 @@ module NoThrowNewErrorCheckConfig implements DataFlow::ConfigSig {`
`84`	`84`	`source.asExpr() instanceof NotWrappedNoThrowAllocExpr`
`85`	`85`	`}`
`86`	`86`
`87`		`- predicate isSink(DataFlow::Node sink) { sink.asExpr() = any(GuardCondition gc).getAChild*() }`
	`87`	`+ predicate isSink(DataFlow::Node sink) {`
	`88`	`+ sink.asExpr().(GuardCondition).valueControlsEdge(_, _, _)`
	`89`	`+ }`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`module NoThrowNewErrorCheckFlow = DataFlow::Global<NoThrowNewErrorCheckConfig>;`