From b360ad06503f23c7c2248c25870263d9d169bc81 Mon Sep 17 00:00:00 2001 From: Stephane Letz Date: Tue, 25 Feb 2014 12:40:36 +0100 Subject: [PATCH] Make JackNetInterface::FinishRecv more robust. --- common/JackNetAPI.cpp | 2 ++ common/JackNetInterface.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index c0d72e53..5934f7a2 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -693,6 +693,8 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf // By default fFrames is fPeriodSize fFrames = fParams.fPeriodSize; + + SessionParamsDisplay(&fParams); AllocPorts(); return 0; diff --git a/common/JackNetInterface.cpp b/common/JackNetInterface.cpp index 25303494..fff5e80f 100644 --- a/common/JackNetInterface.cpp +++ b/common/JackNetInterface.cpp @@ -227,7 +227,11 @@ namespace Jack int JackNetInterface::FinishRecv(NetAudioBuffer* buffer) { - buffer->RenderToJackPorts(fRxHeader.fFrames); + if (buffer) { + buffer->RenderToJackPorts(fRxHeader.fFrames); + } else { + jack_error("FinishRecv with null buffer..."); + } return DATA_PACKET_ERROR; }