colin/abaddon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix regex reading from freed memory (fixes #197)

Browse Source
This commit is contained in:
ouwou
2023-07-25 15:56:22 -04:00
parent 857e94af38
commit 22025c2f0d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/chatmessage.cpp
View File

@@ -204,7 +204,8 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) {
if (data->Application.has_value()) { if (data->Application.has_value()) {
static const auto regex = Glib::Regex::create(R"(</(.*?):(\d+)>)"); static const auto regex = Glib::Regex::create(R"(</(.*?):(\d+)>)");
Glib::MatchInfo match; Glib::MatchInfo match;
if (regex->match(data->Content, match)) { Glib::ustring string = data->Content;
if (regex->match(string, match)) {
const auto cmd = match.fetch(1); const auto cmd = match.fetch(1);
const auto app = data->Application->Name; const auto app = data->Application->Name;
b->insert_markup(s, "<i>used <span color='#697ec4'>" + cmd + "</span> with " + app + "</i>"); b->insert_markup(s, "<i>used <span color='#697ec4'>" + cmd + "</span> with " + app + "</i>");

3
src/startup.cpp
View File

@@ -54,7 +54,8 @@ std::optional<uint32_t> GetBuildNumberFromJSURL(const Glib::ustring &url, const
auto regex = Glib::Regex::create(R"("buildNumber",null!==\(t="(\d+)\"\))"); auto regex = Glib::Regex::create(R"("buildNumber",null!==\(t="(\d+)\"\))");
Glib::MatchInfo match; Glib::MatchInfo match;
if (regex->match(res.text, match)) { Glib::ustring string = res.text;
if (regex->match(string, match)) {
const auto str_value = match.fetch(1); const auto str_value = match.fetch(1);
try { try {
return std::stoul(str_value); return std::stoul(str_value);