Skip to content

Fix segfault on startup on ubuntu25.10/gcc15.2 #13701

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
jonjenssen merged 1 commit into from
Mar 6, 2026
Merged

Fix segfault on startup on ubuntu25.10/gcc15.2 #13701

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
14 changes: 7 additions & 7 deletions ApplicationLibCode/FileInterface/RifOpmFlowDeckFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,6 @@ static std::optional<Opm::FileDeck::Index> findSectionInsertionPoint( std::uniqu
return insertIdx;
}

static std::map<std::string, std::string> blockKeywordNames =
{ { Opm::ParserKeywords::ACTIONX::keywordName, Opm::ParserKeywords::ENDACTIO::keywordName },
{ Opm::ParserKeywords::BOX::keywordName, Opm::ParserKeywords::ENDBOX::keywordName },
{ Opm::ParserKeywords::ACTIONW::keywordName, Opm::ParserKeywords::ENDACTIO::keywordName } };

} // namespace internal

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1004,6 +999,11 @@ bool RifOpmFlowDeckFile::removeKeywordAtIndex( const Opm::FileDeck::Index& index
//--------------------------------------------------------------------------------------------------
int RifOpmFlowDeckFile::removeKeywords( const std::string& keywordName )
{
std::map<std::string, std::string> blockKeywordNames =
{ { Opm::ParserKeywords::ACTIONX::keywordName, Opm::ParserKeywords::ENDACTIO::keywordName },
{ Opm::ParserKeywords::BOX::keywordName, Opm::ParserKeywords::ENDBOX::keywordName },
{ Opm::ParserKeywords::ACTIONW::keywordName, Opm::ParserKeywords::ENDACTIO::keywordName } };

int nRemoved = 0;
if ( m_fileDeck.get() == nullptr ) return nRemoved;

Expand All @@ -1016,9 +1016,9 @@ int RifOpmFlowDeckFile::removeKeywords( const std::string& keywordName )
{
skipIndices.push_back( it );
// If this is a block keyword, we need to skip all keywords until the corresponding end block
if ( internal::blockKeywordNames.contains( keywordName ) )
if ( blockKeywordNames.contains( keywordName ) )
{
const std::string endBlockName = internal::blockKeywordNames.at( keywordName );
const std::string endBlockName = blockKeywordNames.at( keywordName );
while ( it != m_fileDeck->stop() )
{
const auto& innerKw = m_fileDeck->operator[]( it );
Expand Down