77 lines
2.4 KiB
Diff
77 lines
2.4 KiB
Diff
diff --git a/programs/common.c b/programs/common.c
|
|
index 3fc4e3d..282ee33 100644
|
|
--- a/programs/common.c
|
|
+++ b/programs/common.c
|
|
@@ -36,6 +36,7 @@
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
#include <stdint.h>
|
|
+#include <math.h>
|
|
|
|
#include <sndfile.h>
|
|
|
|
@@ -45,7 +46,7 @@
|
|
|
|
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|
|
|
|
-void
|
|
+int
|
|
sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize)
|
|
{ static double data [BUFFER_LEN], max ;
|
|
int frames, readcount, k ;
|
|
@@ -54,6 +55,8 @@ sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize
|
|
readcount = frames ;
|
|
|
|
sf_command (infile, SFC_CALC_SIGNAL_MAX, &max, sizeof (max)) ;
|
|
+ if (!isnormal (max)) /* neither zero, subnormal, infinite, nor NaN */
|
|
+ return 1 ;
|
|
|
|
if (!normalize && max < 1.0)
|
|
{ while (readcount > 0)
|
|
@@ -67,12 +70,16 @@ sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize
|
|
while (readcount > 0)
|
|
{ readcount = sf_readf_double (infile, data, frames) ;
|
|
for (k = 0 ; k < readcount * channels ; k++)
|
|
- data [k] /= max ;
|
|
+ { data [k] /= max ;
|
|
+
|
|
+ if (!isfinite (data [k])) /* infinite or NaN */
|
|
+ return 1;
|
|
+ }
|
|
sf_writef_double (outfile, data, readcount) ;
|
|
} ;
|
|
} ;
|
|
|
|
- return ;
|
|
+ return 0 ;
|
|
} /* sfe_copy_data_fp */
|
|
|
|
void
|
|
@@ -252,7 +259,12 @@ sfe_apply_metadata_changes (const char * filenames [2], const METADATA_INFO * in
|
|
|
|
/* If the input file is not the same as the output file, copy the data. */
|
|
if ((infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT))
|
|
- sfe_copy_data_fp (outfile, infile, sfinfo.channels, SF_FALSE) ;
|
|
+ { if (sfe_copy_data_fp (outfile, infile, sfinfo.channels, SF_FALSE) != 0)
|
|
+ { printf ("Error : Not able to decode input file '%s'\n", filenames [0]) ;
|
|
+ error_code = 1 ;
|
|
+ goto cleanup_exit ;
|
|
+ } ;
|
|
+ }
|
|
else
|
|
sfe_copy_data_int (outfile, infile, sfinfo.channels) ;
|
|
} ;
|
|
diff --git a/programs/common.h b/programs/common.h
|
|
index eda2d7d..986277e 100644
|
|
--- a/programs/common.h
|
|
+++ b/programs/common.h
|
|
@@ -62,7 +62,7 @@ typedef SF_BROADCAST_INFO_VAR (2048) SF_BROADCAST_INFO_2K ;
|
|
|
|
void sfe_apply_metadata_changes (const char * filenames [2], const METADATA_INFO * info) ;
|
|
|
|
-void sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize) ;
|
|
+int sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize) ;
|
|
|
|
void sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels) ;
|
|
|