From f511e6183253d40500b08c5a44a51ebf1ba505ba Mon Sep 17 00:00:00 2001
From: Chris Pahl <sahib@online.de>
Date: Tue, 31 Oct 2023 19:40:54 +0100
Subject: [PATCH] fix: custom: do not crash if input text is not valid utf-8

---
 src/modules/custom.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 287b5588..3a3e0169 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -155,6 +155,7 @@ auto waybar::modules::Custom::update() -> void {
     } else {
       parseOutputRaw();
     }
+
     auto str = fmt::format(fmt::runtime(format_), text_, fmt::arg("alt", alt_),
                            fmt::arg("icon", getIcon(percentage_, alt_)),
                            fmt::arg("percentage", percentage_));
@@ -195,18 +196,23 @@ void waybar::modules::Custom::parseOutputRaw() {
   std::string line;
   int i = 0;
   while (getline(output, line)) {
+    Glib::ustring validated_line = line;
+    if(!validated_line.validate()) {
+      validated_line = validated_line.make_valid();
+    }
+
     if (i == 0) {
       if (config_["escape"].isBool() && config_["escape"].asBool()) {
-        text_ = Glib::Markup::escape_text(line);
+        text_ = Glib::Markup::escape_text(validated_line);
       } else {
-        text_ = line;
+        text_ = validated_line;
       }
-      tooltip_ = line;
+      tooltip_ = validated_line;
       class_.clear();
     } else if (i == 1) {
-      tooltip_ = line;
+      tooltip_ = validated_line;
     } else if (i == 2) {
-      class_.push_back(line);
+      class_.push_back(validated_line);
     } else {
       break;
     }