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

Fix edges to function exit with result variables

Browse Source
This commit is contained in:
Owen Mansel-Chan
2026-05-20 16:17:51 +01:00
parent 0faf3c89df
commit 2c4fe160bf
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
go/ql/lib/semmle/go/controlflow/ControlFlowGraphShared.qll
View File

@@ -703,7 +703,13 @@ module GoCfg {
exists(Go::FuncDef fd |
ast = fd.getBody() and
c.getSuccessorType() instanceof ReturnSuccessor and
n.isAfter(fd.getBody())
(
// If the function has result variables, route the return completion
// through the result-read epilogue before reaching the function exit.
exists(fd.getResultVar(0)) and n.isAdditional(fd, "result-read:0")
or
not exists(fd.getResultVar(_)) and n.isAfter(fd.getBody())
)
)
or
exists(Go::LabeledStmt lbl, Go::FuncDef fd |
@@ -1496,13 +1502,13 @@ module GoCfg {
)
)
or
// After(body) → first epilogue or After(fd) if no result vars
// After(body) → After(fd). Only reachable when there are no result
// variables; with result variables, Go requires the body to end in a
// terminating statement, and the result-read epilogue is entered from
// the return completion (see endAbruptCompletion).
n1.isAfter(fd.getBody()) and
(
exists(fd.getResultVar(0)) and n2.isAdditional(fd, "result-read:0")
or
not exists(fd.getResultVar(_)) and n2.isAfter(fd)
)
not exists(fd.getResultVar(_)) and
n2.isAfter(fd)
or
// result-read:j → result-read:(j+1) or After(fd)
exists(int j | exists(fd.getResultVar(j)) |