alex/nih-plug
1
0
Fork 0
Code Activity

More defensively check for >0 inputs and outputs

Browse source 
Noticed this through a bug in clapval.
This commit is contained in:
Robbert van der Helm 2022-06-28 22:24:57 +02:00
parent 4247c229ec
commit f309f39982
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wrapper/clap/wrapper.rs
View file

@ -1639,7 +1639,7 @@ impl<P: ClapPlugin> Wrapper<P> {
let current_bus_config = wrapper.current_bus_config.load(); let current_bus_config = wrapper.current_bus_config.load();
let has_main_input = current_bus_config.num_input_channels > 0; let has_main_input = current_bus_config.num_input_channels > 0;
let has_main_output = current_bus_config.num_output_channels > 0; let has_main_output = current_bus_config.num_output_channels > 0;
if !process.audio_outputs.is_null() { if process.audio_outputs_count > 0 && !process.audio_outputs.is_null() {
for output_idx in for output_idx in
if has_main_output { 1 } else { 0 }..process.audio_outputs_count as isize if has_main_output { 1 } else { 0 }..process.audio_outputs_count as isize
{ {
@ -1724,7 +1724,8 @@ impl<P: ClapPlugin> Wrapper<P> {
// Explicitly take plugins with no main output that does have auxiliary outputs // Explicitly take plugins with no main output that does have auxiliary outputs
// into account. Shouldn't happen, but if we just start copying audio here then // into account. Shouldn't happen, but if we just start copying audio here then
// that would result in unsoundness. // that would result in unsoundness.
if !process.audio_outputs.is_null() if process.audio_outputs_count > 0
&& !process.audio_outputs.is_null()
&& !(*process.audio_outputs).data32.is_null() && !(*process.audio_outputs).data32.is_null()
&& !output_slices.is_empty() && !output_slices.is_empty()
{ {
@ -1759,8 +1760,10 @@ impl<P: ClapPlugin> Wrapper<P> {
// Some hosts process data in place, in which case we don't need to do any copying // Some hosts process data in place, in which case we don't need to do any copying
// ourselves. If the pointers do not alias, then we'll do the copy here and then the // ourselves. If the pointers do not alias, then we'll do the copy here and then the
// plugin can just do normal in place processing. // plugin can just do normal in place processing.
if !process.audio_outputs.is_null() if process.audio_outputs_count > 0
&& !process.audio_outputs.is_null()
&& !(*process.audio_outputs).data32.is_null() && !(*process.audio_outputs).data32.is_null()
&& process.audio_inputs_count > 0
&& !process.audio_inputs.is_null() && !process.audio_inputs.is_null()
&& !(*process.audio_inputs).data32.is_null() && !(*process.audio_inputs).data32.is_null()
{ {