Fix max channel count bug

The code was allowing files to be written with a channel count of exactly
`SF_MAX_CHANNELS` but was failing to read some file formats with the same
channel count.

Change-Id: Ibe0574a278ccf108a6fe8442ca3a189be19c02ea

diff --git a/src/aiff.c b/src/aiff.c
index 5107afc..9cd02fb 100644 (file)
--- a/src/aiff.c
+++ b/src/aiff.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2016 Erik de Castro Lopo <erikd@mega-nerd.com>
+** Copyright (C) 1999-2018 Erik de Castro Lopo <erikd@mega-nerd.com>
 ** Copyright (C) 2005 David Viens <davidv@plogue.com>
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -944,7 +944,7 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
        if (psf->sf.channels < 1)
                return SFE_CHANNEL_COUNT_ZERO ;
 
-       if (psf->sf.channels >= SF_MAX_CHANNELS)
+       if (psf->sf.channels > SF_MAX_CHANNELS)
                return SFE_CHANNEL_COUNT ;
 
        if (! (found_chunk & HAVE_FORM))
@@ -1024,7 +1024,7 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
        psf_log_printf (psf, "  Sample Rate : %d\n", samplerate) ;
        psf_log_printf (psf, "  Frames      : %u%s\n", comm_fmt->numSampleFrames, (comm_fmt->numSampleFrames == 0 && psf->filelength > 104) ? " (Should not be 0)" : "") ;
 
-       if (comm_fmt->numChannels < 1 || comm_fmt->numChannels >= SF_MAX_CHANNELS)
+       if (comm_fmt->numChannels < 1 || comm_fmt->numChannels > SF_MAX_CHANNELS)
        {       psf_log_printf (psf, "  Channels    : %d (should be >= 1 and < %d)\n", comm_fmt->numChannels, SF_MAX_CHANNELS) ;
                return SFE_CHANNEL_COUNT_BAD ;
                } ;

diff --git a/src/rf64.c b/src/rf64.c
index d57f0f3..876cd45 100644 (file)
--- a/src/rf64.c
+++ b/src/rf64.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2017 Erik de Castro Lopo <erikd@mega-nerd.com>
+** Copyright (C) 2008-2018 Erik de Castro Lopo <erikd@mega-nerd.com>
 ** Copyright (C) 2009      Uli Franke <cls@nebadje.org>
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -388,7 +388,7 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
        if (psf->sf.channels < 1)
                return SFE_CHANNEL_COUNT_ZERO ;
 
-       if (psf->sf.channels >= SF_MAX_CHANNELS)
+       if (psf->sf.channels > SF_MAX_CHANNELS)
                return SFE_CHANNEL_COUNT ;
 
        /* WAVs can be little or big endian */

diff --git a/src/w64.c b/src/w64.c
index e508c69..39ff2c9 100644 (file)
--- a/src/w64.c
+++ b/src/w64.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2017 Erik de Castro Lopo <erikd@mega-nerd.com>
+** Copyright (C) 1999-2018 Erik de Castro Lopo <erikd@mega-nerd.com>
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -379,7 +379,7 @@ w64_read_header     (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
        if (psf->sf.channels < 1)
                return SFE_CHANNEL_COUNT_ZERO ;
 
-       if (psf->sf.channels >= SF_MAX_CHANNELS)
+       if (psf->sf.channels > SF_MAX_CHANNELS)
                return SFE_CHANNEL_COUNT ;
 
        psf->endian = SF_ENDIAN_LITTLE ;                /* All W64 files are little endian. */

diff --git a/src/wav.c b/src/wav.c
index bcb2153..c21d333 100644 (file)
--- a/src/wav.c
+++ b/src/wav.c
@@ -620,7 +620,7 @@ wav_read_header     (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
        if (psf->sf.channels < 1)
                return SFE_CHANNEL_COUNT_ZERO ;
 
-       if (psf->sf.channels >= SF_MAX_CHANNELS)
+       if (psf->sf.channels > SF_MAX_CHANNELS)
                return SFE_CHANNEL_COUNT ;
 
        if (format != WAVE_FORMAT_PCM && (parsestage & HAVE_fact) == 0)