From 5d6fab183e3b3ed28fc9d4fd8b03690627bbb77f Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 21 Jun 2020 07:16:37 +0200
Subject: [PATCH] merge fixes

---
 ChangeLog       | 1 +
 src/channel.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b05daa6d..d6f572b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
 
 - the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353)
 
+- added some protections to the code, coded by atsampson (#380, #381, #382)
 
 
 
diff --git a/src/channel.cpp b/src/channel.cpp
index 728e9e79..cfc4e118 100755
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -29,7 +29,7 @@
 CChannel::CChannel ( const bool bNIsServer ) :
     vecdGains              ( MAX_NUM_CHANNELS, 1.0 ),
     vecdPannings           ( MAX_NUM_CHANNELS, 0.5 ),
-    iCurSockBufNumFrames   ( -1 ),
+    iCurSockBufNumFrames   ( INVALID_INDEX ),
     bDoAutoSockBufSize     ( true ),
     iFadeInCnt             ( 0 ),
     iFadeInCntMax          ( FADE_IN_NUM_FRAMES_DBLE_FRAMESIZE ),