From abb75d4a2eeafc9894011998cb263449c55bc4e0 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 15 Jan 2014 10:38:32 +0100 Subject: [PATCH] prevent stackoverflow when pannable changes to fewer params endless loop: e.g. 2in2out -> balance (or 1in1out) #23 0xb7ab5c17 in ARDOUR::Pannable::value_as_string #24 0xb2ebb206 in ARDOUR::Pannerbalance::value_as_string #25 0xb7ab5c17 in ARDOUR::Pannable::value_as_string #26 0xb2ebb206 in ARDOUR::Pannerbalance::value_as_string ad infinitum --- libs/panners/1in2out/panner_1in2out.cc | 2 +- libs/panners/2in2out/panner_2in2out.cc | 2 +- libs/panners/stereobalance/panner_balance.cc | 2 +- libs/panners/vbap/vbap.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc index 12e7896cfb..4dd21493e6 100644 --- a/libs/panners/1in2out/panner_1in2out.cc +++ b/libs/panners/1in2out/panner_1in2out.cc @@ -385,7 +385,7 @@ Panner1in2out::value_as_string (boost::shared_ptr ac) const (int) rint (100.0 * val)); default: - return _pannable->value_as_string (ac); + return _("unused"); } } diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index 463b2671bb..860610ecfc 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -529,7 +529,7 @@ Panner2in2out::value_as_string (boost::shared_ptr ac) const return string_compose (_("Width: %1%%"), (int) floor (100.0 * val)); default: - return _pannable->value_as_string (ac); + return _("unused"); } } diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc index d5ab96b73c..b7d8a2a031 100644 --- a/libs/panners/stereobalance/panner_balance.cc +++ b/libs/panners/stereobalance/panner_balance.cc @@ -321,7 +321,7 @@ Pannerbalance::value_as_string (boost::shared_ptr ac) const (int) rint (100.0 * val)); default: - return _pannable->value_as_string (ac); + return _("unused"); } } diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index 2ab91cf3c4..b092be29d0 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -430,7 +430,7 @@ VBAPanner::value_as_string (boost::shared_ptr ac) const return string_compose (_("%1\u00B0"), (int) floor (90.0 * fabs(val))); default: - return _pannable->value_as_string (ac); + return _("unused"); } }