RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: No need to format string with unused 'arg' named argument (#484) 

The fmt::format() function looks for the "{arg}" named argument
in the given "format" string which does not exist. It will fail
if the string contains any {...} curled-brace substring.

Consequently, any "on-click*" option's command line containing for
instance substring like "${var}" or "awk '{...}'" will crash the program.

Signed-off-by: Thomas Venriès <thomas.venries@gmail.com>
pull/485/head
Thomas Venriès 2019-10-16 19:37:12 +02:00
parent 5e4fdb1530
commit 358426cb1c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/AModule.hpp
View File

@ -26,7 +26,6 @@ class AModule : public IModule {
const Json::Value &config_; const Json::Value &config_;
Gtk::EventBox event_box_; Gtk::EventBox event_box_;
std::string click_param_;
virtual bool handleToggle(GdkEventButton *const &ev); virtual bool handleToggle(GdkEventButton *const &ev);
virtual bool handleScroll(GdkEventScroll *); virtual bool handleScroll(GdkEventScroll *);

2
src/AModule.cpp
View File

@ -46,7 +46,7 @@ bool AModule::handleToggle(GdkEventButton* const& e) {
format = config_["on-click-forward"].asString(); format = config_["on-click-forward"].asString();
} }
if (!format.empty()) { if (!format.empty()) {
pid_.push_back(util::command::forkExec(fmt::format(format, fmt::arg("arg", click_param_)))); pid_.push_back(util::command::forkExec(format));
} }
dp.emit(); dp.emit();
return true; return true;