|
 |
bc994d |
From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001
|
|
|
bc994d |
From: David Bryant <david@wavpack.com>
|
|
|
bc994d |
Date: Tue, 24 Apr 2018 17:27:01 -0700
|
|
|
bc994d |
Subject: [PATCH 1/2] issue #33, sanitize size of unknown chunks before
|
|
|
bc994d |
malloc()
|
|
|
bc994d |
|
|
|
bc994d |
---
|
|
|
bc994d |
cli/dsdiff.c | 9 ++++++++-
|
|
|
bc994d |
cli/riff.c | 9 ++++++++-
|
|
|
bc994d |
cli/wave64.c | 9 ++++++++-
|
|
|
bc994d |
3 files changed, 24 insertions(+), 3 deletions(-)
|
|
|
bc994d |
|
|
|
bc994d |
diff --git a/cli/dsdiff.c b/cli/dsdiff.c
|
|
|
bc994d |
index c016df9..fa56bbb 100644
|
|
|
bc994d |
--- a/cli/dsdiff.c
|
|
|
bc994d |
+++ b/cli/dsdiff.c
|
|
|
bc994d |
@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
|
|
|
bc994d |
else { // just copy unknown chunks to output file
|
|
|
bc994d |
|
|
|
bc994d |
int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1);
|
|
|
bc994d |
- char *buff = malloc (bytes_to_copy);
|
|
|
bc994d |
+ char *buff;
|
|
|
bc994d |
+
|
|
|
bc994d |
+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
|
|
|
bc994d |
+ error_line ("%s is not a valid .DFF file!", infilename);
|
|
|
bc994d |
+ return WAVPACK_SOFT_ERROR;
|
|
|
bc994d |
+ }
|
|
|
bc994d |
+
|
|
|
bc994d |
+ buff = malloc (bytes_to_copy);
|
|
|
bc994d |
|
|
|
bc994d |
if (debug_logging_mode)
|
|
|
bc994d |
error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
|
|
|
bc994d |
diff --git a/cli/riff.c b/cli/riff.c
|
|
|
bc994d |
index de98c1e..7bddf63 100644
|
|
|
bc994d |
--- a/cli/riff.c
|
|
|
bc994d |
+++ b/cli/riff.c
|
|
|
bc994d |
@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
|
|
|
bc994d |
else { // just copy unknown chunks to output file
|
|
|
bc994d |
|
|
|
bc994d |
int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L;
|
|
|
bc994d |
- char *buff = malloc (bytes_to_copy);
|
|
|
bc994d |
+ char *buff;
|
|
|
bc994d |
+
|
|
|
bc994d |
+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
|
|
|
bc994d |
+ error_line ("%s is not a valid .WAV file!", infilename);
|
|
|
bc994d |
+ return WAVPACK_SOFT_ERROR;
|
|
|
bc994d |
+ }
|
|
|
bc994d |
+
|
|
|
bc994d |
+ buff = malloc (bytes_to_copy);
|
|
|
bc994d |
|
|
|
bc994d |
if (debug_logging_mode)
|
|
|
bc994d |
error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
|
|
|
bc994d |
diff --git a/cli/wave64.c b/cli/wave64.c
|
|
|
bc994d |
index 591d640..fa928a0 100644
|
|
|
bc994d |
--- a/cli/wave64.c
|
|
|
bc994d |
+++ b/cli/wave64.c
|
|
|
bc994d |
@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
|
|
|
bc994d |
}
|
|
|
bc994d |
else { // just copy unknown chunks to output file
|
|
|
bc994d |
int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L;
|
|
|
bc994d |
- char *buff = malloc (bytes_to_copy);
|
|
|
bc994d |
+ char *buff;
|
|
|
bc994d |
+
|
|
|
bc994d |
+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
|
|
|
bc994d |
+ error_line ("%s is not a valid .W64 file!", infilename);
|
|
|
bc994d |
+ return WAVPACK_SOFT_ERROR;
|
|
|
bc994d |
+ }
|
|
|
bc994d |
+
|
|
|
bc994d |
+ buff = malloc (bytes_to_copy);
|
|
|
bc994d |
|
|
|
bc994d |
if (debug_logging_mode)
|
|
|
bc994d |
error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
|
|
|
bc994d |
--
|
|
|
bc994d |
2.14.3
|
|
|
bc994d |
|