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

Fix heap-use-after-free on XMLElementParser.cpp #3866

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Fix heap-use-after-free on XMLElementParser.cpp #3866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd5730
Fix heap-use-after-free on XMLElementParser.cpp
MiguelCompany Sep 21, 2023
12b5da5
Fix asan workflow
EduPonz Sep 21, 2023
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
25 changes: 20 additions & 5 deletions .github/workflows/sanitizer-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:

runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}

steps:
- uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
with:
Expand All @@ -39,7 +42,7 @@ jobs:
- uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
file_name: fastrtps.repos
file_result: fastrtps.repos

Expand All @@ -49,6 +52,11 @@ jobs:
vcs_repos_file: fastrtps.repos
destination_workspace: src

- name: Checkout Fast DDS branch
run: |
cd ./src/fastrtps
git checkout ${{ env.FASTDDS_BRANCH }}

- name: Install apt packages
uses: ./src/fastrtps/.github/actions/install-apt-packages

Expand Down Expand Up @@ -100,6 +108,10 @@ jobs:

runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'master' }}

steps:
- uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
with:
Expand All @@ -112,7 +124,7 @@ jobs:
- uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
file_name: fastrtps.repos
file_result: fastrtps.repos

Expand All @@ -122,14 +134,17 @@ jobs:
vcs_repos_file: fastrtps.repos
destination_workspace: src

- name: Checkout Fast DDS branch
run: |
cd ./src/fastrtps
git checkout ${{ env.FASTDDS_BRANCH }}

- name: Sync eProsima/Discovery-Server repository
uses: actions/checkout@v4
env:
DEFAULT_DISCOVERY_SERVER_BRANCH: 'master'
with:
path: src/discovery_server
repository: eProsima/Discovery-Server
ref: ${{ github.event.inputs.discovery_server_branch || env.DEFAULT_DISCOVERY_SERVER_BRANCH }}
ref: ${{ env.DEFAULT_DISCOVERY_SERVER_BRANCH }}

- name: Install apt packages
uses: ./src/fastrtps/.github/actions/install-apt-packages
Expand Down
5 changes: 3 additions & 2 deletions src/cpp/rtps/xmlparser/XMLElementParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,16 @@ static std::string process_environment(
std::regex_search(ret_val, match, expression);
if (!match.empty())
{
std::string var_name = match[1];
std::string value;
if (ReturnCode_t::RETCODE_OK == SystemInfo::get_env(match[1], value))
if (ReturnCode_t::RETCODE_OK == SystemInfo::get_env(var_name, value))
{
ret_val = match.prefix().str() + value + match.suffix().str();
}
else
{
ret_val = match.prefix().str() + match.suffix().str();
EPROSIMA_LOG_ERROR(XMLPARSER, "Could not find a value for environment variable " << match[1]);
EPROSIMA_LOG_ERROR(XMLPARSER, "Could not find a value for environment variable " << var_name);
}
}
} while (!match.empty());
Expand Down