hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-07-28 22:36:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Jeroen Ketema
2026-07-23 13:22:43 +02:00
parent c95a8ab9d2
commit 9976a7a3ac
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
go/extractor/util/subst_windows.go
View File

@@ -30,9 +30,14 @@ func init() {
}
p, err := d.FindProc("resolve_subst")
if err != nil {
d.Release()
return
}
f, err := d.FindProc("resolve_subst_free")
if err != nil {
d.Release()
return
}
f, _ := d.FindProc("resolve_subst_free")
dll = d
procResolve = p
procFree = f

9
java/kotlin-extractor/src/main/java/com/semmle/util/files/SubstResolver.java
View File

@@ -18,7 +18,7 @@ public class SubstResolver {
boolean loaded = false;
if (File.separatorChar == '\\') {
String dist = System.getenv("CODEQL_DIST");
if (dist != null && !dist.isEmpty()) {
if (dist != null && !dist.isEmpty()) {
try {
Path library = Paths.get(dist).resolve("tools")
.resolve("win64").resolve("canonicalize.dll").toAbsolutePath();
@@ -61,7 +61,12 @@ public class SubstResolver {
return f;
}
String resolved = nativeResolveSubst(path.substring(0, 3));
String resolved;
try {
resolved = nativeResolveSubst(path.substring(0, 3));
} catch (UnsatisfiedLinkError ignored) {
return f;
}
if (resolved == null) {
return f;
}