Skip to content

fix: reject overflowing SVG RGB components #6

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

Open
tonycoder-hub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: reject overflowing SVG RGB components #6

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
24 changes: 21 additions & 3 deletions frameworks/core/components_ng/svg/parse/svg_attributes_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "frameworks/core/components_ng/svg/parse/svg_attributes_parser.h"

#include <charconv>
#include <regex>

#include "core/common/container.h"
Expand Down Expand Up @@ -372,9 +373,26 @@ bool SvgAttributesParser::CheckColorAlpha(const std::string& colorStr, Color& re
matches[RGBA_MATCH_BLUE].length(), matches[RGBA_MATCH_ALPHA].length());
return false;
}
auto red = static_cast<uint8_t>(std::stoi(matches[RGBA_MATCH_RED]));
auto green = static_cast<uint8_t>(std::stoi(matches[RGBA_MATCH_GREEN]));
auto blue = static_cast<uint8_t>(std::stoi(matches[RGBA_MATCH_BLUE]));
auto parseRgb = [](const std::string &value, uint8_t &result) {
uint32_t parsedValue = 0;
const char *begin = value.data();
const char *end = begin + value.size();
auto parsed = std::from_chars(begin, end, parsedValue);
if (parsed.ec != std::errc{} || parsed.ptr != end || parsedValue > UINT8_MAX) {
return false;
}
result = static_cast<uint8_t>(parsedValue);
return true;
};
uint8_t red = 0;
uint8_t green = 0;
uint8_t blue = 0;
if (!parseRgb(matches[RGBA_MATCH_RED].str(), red) ||
!parseRgb(matches[RGBA_MATCH_GREEN].str(), green) ||
!parseRgb(matches[RGBA_MATCH_BLUE].str(), blue)) {
LOGW("CheckColorAlpha rejected, RGB component is out of range");
return false;
}
auto alpha = static_cast<double>(std::stod(matches[RGBA_MATCH_ALPHA]));
// Scale up from 0~1.0 to 255
result = Color::FromARGB(static_cast<uint8_t>(std::min(MAX_ALPHA, alpha)) * 0xff, red, green, blue);
Expand Down