thirdpartymirrors/Zelda64Recomp
1
0
Fork 0
mirror of https://github.com/Zelda64Recomp/Zelda64Recomp.git synced 2025-10-30 08:03:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix race condition crash when setting element text, bump version to 1.2.0-rc3"

Browse source 
This reverts commit 4934a04d8a.
This commit is contained in:
Mr-Wiseguy 2025-05-02 06:04:12 -04:00
parent 4934a04d8a
commit a03a0faaeb
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/main.cpp
View file

@ -48,7 +48,7 @@
#include "../../lib/rt64/src/contrib/stb/stb_image.h"
const std::string version_string = "1.2.0-rc3";
const std::string version_string = "1.2.0-rc2";
template<typename... Ts>
void exit_error(const char* str, Ts ...args) {

30
src/ui/elements/ui_element.cpp
View file

@ -355,16 +355,30 @@ bool Element::is_enabled() const {
return enabled && !disabled_from_parent;
}
// Adapted from RmlUi's `EncodeRml`.
std::string escape_rml(std::string_view string)
{
std::string result;
result.reserve(string.size());
for (char c : string)
{
switch (c)
{
case '<': result += "&lt;"; break;
case '>': result += "&gt;"; break;
case '&': result += "&amp;"; break;
case '"': result += "&quot;"; break;
case '\n': result += "<br/>"; break;
default: result += c; break;
}
}
return result;
}
void Element::set_text(std::string_view text) {
if (can_set_text) {
if (text_element == nullptr) {
Rml::ElementPtr text_element_owning = get_current_context().get_document()->CreateTextNode(std::string{text});
text_element = rmlui_static_cast<Rml::ElementText*>(text_element_owning.get());
base->AppendChild(std::move(text_element_owning));
}
else {
text_element->SetText(std::string{text});
}
// Escape the string into Rml to prevent element injection.
base->SetInnerRML(escape_rml(text));
}
else {
assert(false && "Attempted to set text of an element that cannot have its text set.");

1
src/ui/elements/ui_element.h
View file

@ -25,7 +25,6 @@ class Element : public Style, public Rml::EventListener {
friend class ContextId; // To allow ContextId to call the handle_event method directly.
private:
Rml::Element *base = nullptr;
Rml::ElementText *text_element = nullptr;
Rml::ElementPtr base_owning = {};
uint32_t events_enabled = 0;
std::vector<Style *> styles;