evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible Unicode exception in Directives parsing

Browse Source
This commit is contained in:
Kae 2024-02-29 19:09:10 +11:00
parent 7ff287511d
commit 0b4119ce12
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/core/StarDirectives.cpp
View File

@ -124,7 +124,7 @@ void Directives::parse(String&& directives) {
return; return;
} }
List<Entry> newList; List<Entry> entries;
StringView view(directives); StringView view(directives);
StringView prefix = ""; StringView prefix = "";
view.forEachSplitView("?", [&](StringView split, size_t beg, size_t end) { view.forEachSplitView("?", [&](StringView split, size_t beg, size_t end) {
@ -132,7 +132,7 @@ void Directives::parse(String&& directives) {
if (beg == 0) { if (beg == 0) {
try { try {
ImageOperation operation = imageOperationFromString(split); ImageOperation operation = imageOperationFromString(split);
newList.emplace_back(std::move(operation), beg, end); entries.emplace_back(std::move(operation), beg, end);
} }
catch (StarException const& e) { catch (StarException const& e) {
prefix = split; prefix = split;
@ -141,18 +141,18 @@ void Directives::parse(String&& directives) {
} }
else { else {
ImageOperation operation = NullImageOperation(); ImageOperation operation = NullImageOperation();
newList.emplace_back(std::move(operation), beg, end); entries.emplace_back(std::move(operation), beg, end);
} }
} }
}); });
if (newList.empty() && !prefix.empty()) { if (entries.empty() && !prefix.empty()) {
shared.reset(); shared.reset();
return; return;
} }
shared = std::make_shared<Shared const>(std::move(newList), std::move(directives), prefix); shared = std::make_shared<Shared const>(std::move(entries), std::move(directives), prefix);
if (view.size() < 1000) { // Pre-load short enough directives if (view.utf8().size() < 1000) { // Pre-load short enough directives
for (auto& entry : shared->entries) for (auto& entry : shared->entries)
entry.loadOperation(*shared); entry.loadOperation(*shared);
} }

2
source/core/StarImageProcessing.cpp
View File

@ -230,7 +230,7 @@ ImageOperation imageOperationFromString(StringView string) {
bits.emplace_back(split); bits.emplace_back(split);
}); });
String type = bits.at(0); StringView const& type = bits.at(0);
if (type == "hueshift") { if (type == "hueshift") {
return HueShiftImageOperation::hueShiftDegrees(lexicalCast<float>(bits.at(1))); return HueShiftImageOperation::hueShiftDegrees(lexicalCast<float>(bits.at(1)));