Merge pull request #809 from geoffw0/enclosing

CPP: Small change to 'Resource not released in destructor'

Author: jbj

cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql

@@ -191,9 +191,7 @@ predicate freedInSameMethod(Resource r, Expr acquire) {
   exists(Expr releaseExpr, string kind |
     r.acquisitionWithRequiredKind(acquire, kind) and
     releaseExpr = r.getAReleaseExpr(kind) and
-    releaseExpr.getEnclosingFunction().getEnclosingAccessHolder*() = acquire.getEnclosingFunction()
-    	// here, `getEnclosingAccessHolder*` allows us to go from a nested function or lambda
-    	// expression to the class method enclosing it.
+    releaseExpr.getEnclosingElement+() = acquire.getEnclosingFunction()
   )
 }