Skip to content
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

[jssrc2cpg] Fixed crash on Windows #3980

Merged
merged 1 commit into from
Dec 20, 2023
Merged

[jssrc2cpg] Fixed crash on Windows #3980

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
8 changes: 4 additions & 4 deletions joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/utils/AstGenRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,17 @@ class AstGenRunner(config: Config) {

private val executableArgs = if (!config.tsTypes) " --no-tsTypes" else ""

private def skippedFiles(in: File, astGenOut: List[String]): List[String] = {
private def skippedFiles(astGenOut: List[String]): List[String] = {
val skipped = astGenOut.collect {
case out if out.startsWith("Parsing") =>
val filename = out.substring(out.indexOf(" ") + 1, out.indexOf(":") - 1)
val reason = out.substring(out.indexOf(":") + 2)
logger.warn(s"\t- failed to parse '${in / filename}': '$reason'")
logger.warn(s"\t- failed to parse '$filename': '$reason'")
Option(filename)
case out if !out.startsWith("Converted") && !out.startsWith("Retrieving") =>
val filename = out.substring(0, out.indexOf(" "))
val reason = out.substring(out.indexOf(" ") + 1)
logger.warn(s"\t- failed to parse '${in / filename}': '$reason'")
logger.warn(s"\t- failed to parse '$filename': '$reason'")
Option(filename)
case out =>
logger.debug(s"\t+ $out")
Expand Down Expand Up @@ -320,7 +320,7 @@ class AstGenRunner(config: Config) {
runAstGenNative(in, out) match {
case Success(result) =>
val parsed = filterFiles(SourceFiles.determine(out.toString(), Set(".json")), out)
val skipped = skippedFiles(in, result.toList)
val skipped = skippedFiles(result.toList)
AstGenRunnerResult(parsed.map((in.toString(), _)), skipped.map((in.toString(), _)))
case Failure(f) =>
logger.error("\t- running astgen failed!", f)
Expand Down
Loading