From c552df3b6603c4afa171f699545059cd5f9d55f2 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Thu, 16 Nov 2023 22:19:41 +0100
Subject: [PATCH] fix: Modules did not validate tags used in formats

The 'value' variable that was used for validation, was empty because it
was used in a move at the beginning of the function.

Fixes #3043
---
 CHANGELOG.md              |  1 +
 src/modules/meta/base.cpp | 16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d880c87e..52803e82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `internal/tray`: The module must use the `<tray>` tag (this is the default) ([`#3037`](https://github.com/polybar/polybar/pull/3037))
 
 ## Fixed
+- Modules did not validate that all tags (e.g. `<label>`) used in a format were valid for that format ([`#3043`](https://github.com/polybar/polybar/issues/3043), [`#3045`](https://github.com/polybar/polybar/pull/3045))
 - `internal/tray`: Fixed `module-margin` and `separator` being applied to completely empty tray module ([`#3036`](https://github.com/polybar/polybar/issues/3036), [`#3037`](https://github.com/polybar/polybar/pull/3037))
 
 ## [3.7.0] - 2023-11-05
diff --git a/src/modules/meta/base.cpp b/src/modules/meta/base.cpp
index 80c07e33..8e7b3268 100644
--- a/src/modules/meta/base.cpp
+++ b/src/modules/meta/base.cpp
@@ -92,7 +92,7 @@ namespace modules {
     };
 
     auto format = make_unique<module_format>();
-    format->value = move(value);
+    format->value = std::move(value);
     format->fg = m_conf.get(m_modname, name + "-foreground", formatdef("foreground", format->fg));
     format->bg = m_conf.get(m_modname, name + "-background", formatdef("background", format->bg));
     format->ul = m_conf.get(m_modname, name + "-underline", formatdef("underline", format->ul));
@@ -122,18 +122,14 @@ namespace modules {
     tag_collection.insert(tag_collection.end(), tags.begin(), tags.end());
     tag_collection.insert(tag_collection.end(), whitelist.begin(), whitelist.end());
 
-    size_t start, end;
-    while ((start = value.find('<')) != string::npos && (end = value.find('>', start)) != string::npos) {
-      if (start > 0) {
-        value.erase(0, start);
-        end -= start;
-        start = 0;
-      }
-      string tag{value.substr(start, end + 1)};
+    size_t start = 0;
+    size_t end = 0;
+    while ((start = format->value.find('<', start)) != string::npos && (end = format->value.find('>', start)) != string::npos) {
+      string tag{format->value.substr(start, end - start + 1)};
       if (find(tag_collection.begin(), tag_collection.end(), tag) == tag_collection.end()) {
         throw undefined_format_tag(tag + " is not a valid format tag for \"" + name + "\"");
       }
-      value.erase(0, tag.size());
+      start = end + 1;
     }
 
     m_formats.insert(make_pair(move(name), move(format)));