47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
|
--- a/src/Makefile.am
|
||
|
|
+++ b/src/Makefile.am
|
||
|
|
@@ -95,7 +95,7 @@
|
||
|
|
|
||
|
|
libsox_la_CFLAGS = @WARN_CFLAGS@
|
||
|
|
libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \
|
||
|
|
- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|flush|error|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$'
|
||
|
|
+ -export-symbols-regex '^(sox_.*|lsx_(([cm]|re)alloc.*|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$'
|
||
|
|
|
||
|
|
if HAVE_WIN32_LTDL
|
||
|
|
libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h
|
||
|
|
--- a/src/xmalloc.c
|
||
|
|
+++ b/src/xmalloc.c
|
||
|
|
@@ -41,3 +41,13 @@
|
||
|
|
|
||
|
|
return ptr;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+void *lsx_realloc_array(void *p, size_t n, size_t size)
|
||
|
|
+{
|
||
|
|
+ if (n > (size_t)-1 / size) {
|
||
|
|
+ lsx_fail("malloc size overflow");
|
||
|
|
+ exit(2);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return lsx_realloc(p, n * size);
|
||
|
|
+}
|
||
|
|
--- a/src/xmalloc.h
|
||
|
|
+++ b/src/xmalloc.h
|
||
|
|
@@ -23,12 +23,14 @@
|
||
|
|
#include <stddef.h>
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
+LSX_RETURN_VALID void *lsx_realloc_array(void *p, size_t n, size_t size);
|
||
|
|
+
|
||
|
|
#define lsx_malloc(size) lsx_realloc(NULL, (size))
|
||
|
|
#define lsx_calloc(n,s) (((n)*(s))? memset(lsx_malloc((n)*(s)),0,(n)*(s)) : NULL)
|
||
|
|
#define lsx_Calloc(v,n) v = lsx_calloc(n,sizeof(*(v)))
|
||
|
|
#define lsx_strdup(p) ((p)? strcpy((char *)lsx_malloc(strlen(p) + 1), p) : NULL)
|
||
|
|
#define lsx_memdup(p,s) ((p)? memcpy(lsx_malloc(s), p, s) : NULL)
|
||
|
|
-#define lsx_valloc(v,n) v = lsx_malloc((n)*sizeof(*(v)))
|
||
|
|
-#define lsx_revalloc(v,n) v = lsx_realloc(v, (n)*sizeof(*(v)))
|
||
|
|
+#define lsx_valloc(v,n) v = lsx_realloc_array(NULL, n, sizeof(*(v)))
|
||
|
|
+#define lsx_revalloc(v,n) v = lsx_realloc_array(v, n, sizeof(*(v)))
|
||
|
|
|
||
|
|
#endif
|