hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 04:06:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7529 from erik-krogh/fixup-library-deps

Browse Source 
QL: recognize dependecies of the form: libraryPathDependencies: library-name
This commit is contained in:
Mathias Vorreiter Pedersen
2022-01-14 11:13:56 +00:00
committed by GitHub
parent b02fecf125 cc5e9fea77
commit b51c85597b
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ql/ql/src/codeql_ql/ast/Ast.qll
View File

@@ -2460,6 +2460,9 @@ module YAML {
name = entry.getListItem().getValue().getValue().trim() and name = entry.getListItem().getValue().getValue().trim() and
version = "\"*\"" version = "\"*\""
) )
or
name = this.getProperty("libraryPathDependencies") and
version = "\"*\""
} }
/** Gets the database scheme of this qlpack */ /** Gets the database scheme of this qlpack */

3
ql/ql/test/callgraph/callgraph.expected
View File

@@ -18,9 +18,12 @@ getTarget
| Overrides.qll:24:39:24:48 | MemberCall | Overrides.qll:22:12:22:44 | ClassPredicate bar | | Overrides.qll:24:39:24:48 | MemberCall | Overrides.qll:22:12:22:44 | ClassPredicate bar |
| Overrides.qll:28:3:28:9 | MemberCall | Overrides.qll:6:3:6:29 | ClassPredicate bar | | Overrides.qll:28:3:28:9 | MemberCall | Overrides.qll:6:3:6:29 | ClassPredicate bar |
| Overrides.qll:29:3:29:10 | MemberCall | Overrides.qll:8:3:8:41 | ClassPredicate baz | | Overrides.qll:29:3:29:10 | MemberCall | Overrides.qll:8:3:8:41 | ClassPredicate baz |
| packs/other/OtherThing.qll:5:3:5:8 | PredicateCall | packs/lib/LibThing/Foo.qll:1:1:1:30 | ClasslessPredicate foo |
| packs/other/OtherThing.qll:6:3:6:8 | PredicateCall | packs/src/SrcThing.qll:8:1:8:30 | ClasslessPredicate bar |
| packs/src/SrcThing.qll:4:3:4:8 | PredicateCall | packs/lib/LibThing/Foo.qll:1:1:1:30 | ClasslessPredicate foo | | packs/src/SrcThing.qll:4:3:4:8 | PredicateCall | packs/lib/LibThing/Foo.qll:1:1:1:30 | ClasslessPredicate foo |
| packs/src/SrcThing.qll:5:3:5:8 | PredicateCall | packs/src/SrcThing.qll:8:1:8:30 | ClasslessPredicate bar | | packs/src/SrcThing.qll:5:3:5:8 | PredicateCall | packs/src/SrcThing.qll:8:1:8:30 | ClasslessPredicate bar |
dependsOn dependsOn
| packs/other/qlpack.yml:1:1:1:4 | ql-other-pack-thing | packs/src/qlpack.yml:1:1:1:4 | ql-testing-src-pack |
| packs/src/qlpack.yml:1:1:1:4 | ql-testing-src-pack | packs/lib/qlpack.yml:1:1:1:4 | ql-testing-lib-pack | | packs/src/qlpack.yml:1:1:1:4 | ql-testing-src-pack | packs/lib/qlpack.yml:1:1:1:4 | ql-testing-lib-pack |
exprPredicate exprPredicate
| Foo.qll:24:22:24:31 | predicate | Foo.qll:22:3:22:32 | ClasslessPredicate myThing0 | | Foo.qll:24:22:24:31 | predicate | Foo.qll:22:3:22:32 | ClasslessPredicate myThing0 |

7
ql/ql/test/callgraph/packs/other/OtherThing.qll Normal file
View File

@@ -0,0 +1,7 @@
import LibThing.Foo
import SrcThing
predicate otherThing(int i) {
foo(i) and
bar(i)
}

3
ql/ql/test/callgraph/packs/other/qlpack.yml Normal file
View File

@@ -0,0 +1,3 @@
name: ql-other-pack-thing
version: 0.1.0
libraryPathDependencies: ql-testing-src-pack