summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-04-23 02:25:38 +0200
committerRobin Gareus <robin@gareus.org>2020-04-23 02:25:38 +0200
commit705ac7bfc5cc3e4d793a3c1faa3326d1627679a7 (patch)
tree4aeb8601f566b17f972fce7a44118780fb45eb12 /libs/ardour
parent3d166c77891c2a83de35c5fd10c0b23c131bc43b (diff)
Prevent huge stack allocations for MIDNAM files
xmlParseMemory() uses a c-pointer char*. Previously MIDNAM data on the heap were wrapped inside a std::string only to be later accessed via c_str().
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/midi_patch_manager.h4
-rw-r--r--libs/ardour/midi_patch_manager.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index 148a946c3a..cb4f492bc4 100644
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -64,8 +64,8 @@ public:
PBD::Signal0<void> PatchesChanged;
- bool add_custom_midnam (const std::string& id, const std::string& midnam);
- bool update_custom_midnam (const std::string& id, const std::string& midnam);
+ bool add_custom_midnam (const std::string& id, char const*);
+ bool update_custom_midnam (const std::string& id, char const*);
bool remove_custom_midnam (const std::string& id);
bool is_custom_model (const std::string& model) const;
diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index 1ceaa17924..82dd38a240 100644
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -81,7 +81,7 @@ MidiPatchManager::add_search_path (const Searchpath& search_path)
}
bool
-MidiPatchManager::add_custom_midnam (const std::string& id, const std::string& midnam)
+MidiPatchManager::add_custom_midnam (const std::string& id, char const* midnam)
{
boost::shared_ptr<MIDINameDocument> document;
document = boost::shared_ptr<MIDINameDocument>(new MIDINameDocument());
@@ -103,7 +103,7 @@ MidiPatchManager::remove_custom_midnam (const std::string& id)
}
bool
-MidiPatchManager::update_custom_midnam (const std::string& id, const std::string& midnam)
+MidiPatchManager::update_custom_midnam (const std::string& id, char const* midnam)
{
Glib::Threads::Mutex::Lock lm (_lock);
remove_midi_name_document ("custom:" + id, false);