Skip to content

[gosrc2cpg] fix: check before accessing some variables #5899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicovell3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[gosrc2cpg] fix: check before accessing some variables #5899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions joern-cli/frontends/gosrc2cpg/src/main/scala/io/joern/gosrc2cpg/astcreation/AstCreator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import ujson.Value

import java.nio.file.Paths
import scala.collection.mutable
import scala.util.{Failure, Success, Try}

class AstCreator(
val jsonAstFilePath: String,
Expand Down Expand Up @@ -74,9 +75,14 @@ class AstCreator(
scope.pushNewScope(fakeGlobalMethodForFile)
val blockNode_ = blockNode(rootNode, Defines.empty, Defines.anyTypeName)
val methodReturn = methodReturnNode(rootNode, Defines.anyTypeName)
val declsAsts = rootNode
.json(ParserKeys.Decls)
.arr

val declsArr = Try(rootNode.json(ParserKeys.Decls).arr) match {
case Success(arr) => arr
case Failure(_) =>
logger.warn(s"No declarations in root node of file $jsonAstFilePath")
List()
}
val declsAsts = declsArr
.flatMap { item =>
val node = createParserNodeInfo(item)
astForNode(node, true)
Expand Down
8 changes: 7 additions & 1 deletion ...ends/gosrc2cpg/src/main/scala/io/joern/gosrc2cpg/astcreation/AstForFunctionsCreator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,17 @@ trait AstForFunctionsCreator(implicit withSchemaValidation: ValidationMode) { th
methodAstParentStack.push(methodNode_)
scope.pushNewScope(methodNode_)
val receiverNode = astForReceiver(methodMetadata.receiverInfo)
val body = Try (funcDecl.json(ParserKeys.Body)) match {
case Failure(_) =>
logger.warn(s"Cannot get function body ast at filename ${parserResult.fullPath} line ${funcDecl.lineNumber}")
return Seq.empty
case Success(value) => value
}
val astForMethod =
methodAst(
methodNode_,
receiverNode ++ astForMethodParameter(methodMetadata.params, methodMetadata.genericTypeMethodMap),
astForMethodBody(funcDecl.json(ParserKeys.Body)),
astForMethodBody(body),
methodReturn
)
scope.popScope()
Expand Down
47 changes: 31 additions & 16 deletions ...nds/gosrc2cpg/src/main/scala/io/joern/gosrc2cpg/astcreation/AstForStatementsCreator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import io.shiftleft.codepropertygraph.generated.nodes.{ExpressionNew, NewIdentif
import io.shiftleft.codepropertygraph.generated.{ControlStructureTypes, DispatchTypes, Operators, PropertyNames}
import ujson.Value

import scala.util.Try
import scala.util.{Failure, Success, Try}

trait AstForStatementsCreator(implicit withSchemaValidation: ValidationMode) { this: AstCreator =>
def astForBlockStatement(blockStmt: ParserNodeInfo, order: Int = -1): Ast = {
Expand Down Expand Up @@ -182,24 +182,28 @@ trait AstForStatementsCreator(implicit withSchemaValidation: ValidationMode) { t

private def astForTypeSwitchStatement(typeSwitchStmt: ParserNodeInfo): Ast = {

val conditionParserNode = Try(createParserNodeInfo(typeSwitchStmt.json(ParserKeys.Assign)))
val (code, conditionAst) = conditionParserNode.toOption match {
val conditionParserNodeOpt = Try(createParserNodeInfo(typeSwitchStmt.json(ParserKeys.Assign))).toOption
val (code, conditionAst) = conditionParserNodeOpt match {
case Some(node) => (node.code, astForNode(node))
case _ => ("", Seq.empty)
case _ =>
logger.warn(s"Cannot get switch condition ast at filename ${parserResult.fullPath} line ${typeSwitchStmt.lineNumber}")
("", Seq.empty)
}
val switchNode = controlStructureNode(typeSwitchStmt, ControlStructureTypes.SWITCH, s"switch $code")
val stmtAsts = astsForStatement(createParserNodeInfo(typeSwitchStmt.json(ParserKeys.Body)))
val id = conditionAst
.flatMap(_.root)
.collectFirst {
case x: NewIdentifier => identifierNode(conditionParserNode.get, x.name, x.code, x.typeFullName)
case x: NewLocal => identifierNode(conditionParserNode.get, x.name, x.code, x.typeFullName)

val condition: Option[Ast] = conditionParserNodeOpt.flatMap { pNode =>
conditionAst.flatMap(_.root).collectFirst {
case x: NewIdentifier =>
val idNode = identifierNode(pNode, x.name, x.code, x.typeFullName)
val isOp = callNode(pNode, s"${idNode.name}.(type)", Operators.is, Operators.is, DispatchTypes.STATIC_DISPATCH)
callAst(isOp, Seq(Ast(idNode)))
case x: NewLocal =>
val idNode = identifierNode(pNode, x.name, x.code, x.typeFullName)
val isOp = callNode(pNode, s"${idNode.name}.(type)", Operators.is, Operators.is, DispatchTypes.STATIC_DISPATCH)
callAst(isOp, Seq(Ast(idNode)))
}
.get
val identifier = Ast(id)
val isOp =
callNode(conditionParserNode.get, s"${id.name}.(type)", Operators.is, Operators.is, DispatchTypes.STATIC_DISPATCH)
val condition = Option(callAst(isOp, Seq(identifier)))
}

val newStmtAst = stmtAsts // TODO: Push conditionAst to the front of the block
controlStructureAst(switchNode, condition, newStmtAst)
Expand All @@ -219,7 +223,13 @@ trait AstForStatementsCreator(implicit withSchemaValidation: ValidationMode) { t
Seq(Ast(target))
}

val caseBodyAst = caseStmt.json(ParserKeys.Body).arr.map(createParserNodeInfo).flatMap(astsForStatement(_)).toList
val caseBodyAst = Try(caseStmt.json(ParserKeys.Body).arr.map(createParserNodeInfo).flatMap(astsForStatement(_)).toList) match {
case Success(value) =>
value
case Failure(_) =>
logger.warn(s"Cannot get case body ast at filename ${parserResult.fullPath} line ${caseStmt.lineNumber}")
Seq.empty[Ast]
}
caseClauseAst ++: caseBodyAst
}

Expand Down Expand Up @@ -249,7 +259,12 @@ trait AstForStatementsCreator(implicit withSchemaValidation: ValidationMode) { t
rangeStmt.json.obj.contains(ParserKeys.Key) match {
case true =>
val keyParserNode = createParserNodeInfo(rangeStmt.json(ParserKeys.Key))
val declParserNode = createParserNodeInfo(keyParserNode.json(ParserKeys.Obj)(ParserKeys.Decl))
val declParserNode = Try(createParserNodeInfo(keyParserNode.json(ParserKeys.Obj)(ParserKeys.Decl))) match {
case Failure(exception) =>
logger.warn(s"Empty range declaration node in filename ${parserResult.fullPath} line ${keyParserNode.lineNumber}")
nullSafeCreateParserNodeInfo(None)
case Success(value) => value
}
val code = s"for ${declParserNode.code}"
val forNode = controlStructureNode(rangeStmt, ControlStructureTypes.FOR, code)
val declAst = astsForStatement(declParserNode)
Expand Down