sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP on segfault with Unruly Drums + Carla

Browse source 
The bug appears "sometimes" on construction of headerIterator.
The regex engine is deeply nested at this point.
This commit is contained in:
Paul Ferrand 2019-12-17 23:29:26 +01:00
parent 0f5fe04168
commit 5f891ddacf
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sfizz/Parser.cpp
View file

@ -43,6 +43,7 @@ void removeCommentOnLine(absl::string_view& line)
bool sfz::Parser::loadSfzFile(const fs::path& file) bool sfz::Parser::loadSfzFile(const fs::path& file)
{ {
const svregex_iterator regexEnd {};
const auto sfzFile = file.is_absolute() ? file : originalDirectory / file; const auto sfzFile = file.is_absolute() ? file : originalDirectory / file;
if (!fs::exists(sfzFile)) if (!fs::exists(sfzFile))
return false; return false;
@ -54,18 +55,21 @@ bool sfz::Parser::loadSfzFile(const fs::path& file)
aggregatedContent = absl::StrJoin(lines, " "); aggregatedContent = absl::StrJoin(lines, " ");
const absl::string_view aggregatedView { aggregatedContent }; const absl::string_view aggregatedView { aggregatedContent };
svregex_iterator headerIterator(aggregatedView.cbegin(), aggregatedView.cend(), sfz::Regexes::headers); // FIXME: segfaults with Carla + libstdc++ + the "bug" file in Unruly Drums; sometimes it takes a couple of tries for the
const auto regexEnd = svregex_iterator(); // segmentation fault to appear
svregex_iterator headerIterator { aggregatedView.cbegin(), aggregatedView.cend(), sfz::Regexes::headers };
std::vector<Opcode> currentMembers; std::vector<Opcode> currentMembers;
for (; headerIterator != regexEnd; ++headerIterator) { for (; headerIterator != regexEnd; ++headerIterator) {
svmatch_results headerMatch = *headerIterator; svmatch_results headerMatch = *headerIterator;
// Can't use uniform initialization here because it generates narrowing conversions ASSERT(headerMatch[1].length() > 0);
const absl::string_view header(&*headerMatch[1].first, headerMatch[1].length()); ASSERT(headerMatch[2].length() > 0);
const absl::string_view members(&*headerMatch[2].first, headerMatch[2].length()); // MSVC needed a hack there using &*headerMatch[1].first; removed it for now
auto paramIterator = svregex_iterator(members.cbegin(), members.cend(), sfz::Regexes::members); const absl::string_view header { headerMatch[1].first, static_cast<size_t>(headerMatch[1].length()) };
const absl::string_view members { headerMatch[2].first, static_cast<size_t>(headerMatch[2].length()) };
svregex_iterator paramIterator { members.cbegin(), members.cend(), sfz::Regexes::members };
// Store or handle members // Store or handle members
for (; paramIterator != regexEnd; ++paramIterator) { for (; paramIterator != regexEnd; ++paramIterator) {