shithub: sox

Info  •  Files  •  Log  •  Branches

Fixing cleanup code.  Could access invalid pointer.

--- a/src/avg.c

+++ b/src/avg.c

@@ -20,6 +20,7 @@

 #include "st.h"

 #include <ctype.h>

+#include <string.h>

 /* Private data for SKEL file */

 typedef struct avgstuff {

--- a/src/band.c

+++ b/src/band.c

@@ -44,6 +44,7 @@

  */

 #include <math.h>

+#include <string.h>

 #include "st.h"

 /* Private data for Bandpass effect */

--- a/src/ima_rw.c

+++ b/src/ima_rw.c

@@ -22,6 +22,7 @@

 #include <sys/types.h>

 #include <math.h>

 #include <stdio.h>

+#include <stdlib.h>

 #include "ima_rw.h"

 /*

--- a/src/sox.c

+++ b/src/sox.c

@@ -997,9 +997,9 @@

 /* called from util.c:fail */

 void cleanup(void) {

 	/* Close the input file and outputfile before exiting*/

-	if (informat->fp)

+	if (informat && informat->fp)

 		fclose(informat->fp);

-	if (outformat->fp) {

+	if (outformat && outformat->fp) {

 		fclose(outformat->fp);

 		/* remove the output file because we failed, if it's ours. */

 		/* Don't if its not a regular file. */

--- a/src/stat.c

+++ b/src/stat.c

@@ -17,6 +17,7 @@

  */

 #include <math.h>

+#include <string.h>

 #include "st.h"

 /* Private data for STAT effect */