Skip to content

chore: address Value field issue for empty strings in dataflow analysis #1281

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

Merged
behnazh-w merged 1 commit into from
Jan 19, 2026
Merged

chore: address Value field issue for empty strings in dataflow analysis #1281

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
8 changes: 5 additions & 3 deletions src/macaron/code_analyzer/dataflow_analysis/bash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2025 - 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2025 - 2026, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.

"""Dataflow analysis implementation for analysing Bash shell scripts."""
Expand Down Expand Up @@ -1811,7 +1811,7 @@ def convert_shell_word_to_value(
if dbl_quoted_parts is not None:
return convert_shell_value_sequence_to_fact_value(dbl_quoted_parts, context), True

sgl_quoted_str = parse_sql_quoted_string(word)
sgl_quoted_str = parse_sgl_quoted_string(word)
if sgl_quoted_str is not None:
return facts.StringLiteral(sgl_quoted_str), True

Expand Down Expand Up @@ -1842,7 +1842,7 @@ def parse_dbl_quoted_string(word: bashparser_model.Word) -> list[LiteralOrEnvVar
return None


def parse_sql_quoted_string(word: bashparser_model.Word) -> str | None:
def parse_sgl_quoted_string(word: bashparser_model.Word) -> str | None:
"""Parse single quoted string.

If the given word is a single quoted string, return the string
Expand All @@ -1851,6 +1851,8 @@ def parse_sql_quoted_string(word: bashparser_model.Word) -> str | None:
if len(word["Parts"]) == 1:
part = word["Parts"][0]
if bashparser_model.is_sgl_quoted(part):
if "Value" not in part:
return ""
return part["Value"]

return None
Expand Down
4 changes: 2 additions & 2 deletions src/macaron/parsers/bashparser_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024 - 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2024 - 2026, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.

"""Type definitions for Bash AST as produced (and json-serialised) by the "mvdan.cc/sh/v3/syntax" bash parser."""
Expand Down Expand Up @@ -159,7 +159,7 @@ class SglQuoted(TypedDict):
Left: Pos
Right: Pos
Dollar: NotRequired[bool]
Value: str
Value: NotRequired[str]


def is_sgl_quoted(part: WordPart) -> TypeGuard[SglQuoted]:
Expand Down
Loading