33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From: Helmut Grohne <helmut@subdivi.de>
|
||
|
|
Date: Sat, 11 Nov 2023 18:18:40 +0100
|
||
|
|
Subject: formats: reject implausible rate
|
||
|
|
|
||
|
|
Bug: https://sourceforge.net/p/sox/bugs/360/
|
||
|
|
Bug-Debian: https://bugs.debian.org/1012516
|
||
|
|
---
|
||
|
|
src/formats_i.c | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/formats_i.c b/src/formats_i.c
|
||
|
|
index 602e044..63f8797 100644
|
||
|
|
--- a/src/formats_i.c
|
||
|
|
+++ b/src/formats_i.c
|
||
|
|
@@ -70,9 +70,15 @@ int lsx_check_read_params(sox_format_t * ft, unsigned channels,
|
||
|
|
ft->signal.channels = channels;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (rate && ft->signal.rate && ft->signal.rate != rate)
|
||
|
|
+ if (rate && ft->signal.rate && ft->signal.rate != rate) {
|
||
|
|
lsx_warn("`%s': overriding sample rate", ft->filename);
|
||
|
|
- else ft->signal.rate = rate;
|
||
|
|
+ /* Since NaN comparisons yield false, the negation rejects them. */
|
||
|
|
+ } else if (!(rate > 0)) {
|
||
|
|
+ lsx_fail_errno(ft, EINVAL, "invalid rate value");
|
||
|
|
+ return SOX_EOF;
|
||
|
|
+ } else {
|
||
|
|
+ ft->signal.rate = rate;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (encoding && ft->encoding.encoding && ft->encoding.encoding != encoding)
|
||
|
|
lsx_warn("`%s': overriding encoding type", ft->filename);
|