36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From: Helmut Grohne <helmut@subdivi.de>
|
||
|
|
Date: Sat, 11 Nov 2023 18:18:40 +0100
|
||
|
|
Subject: sphere: avoid integer underflow
|
||
|
|
|
||
|
|
Link: https://talosintelligence.com/vulnerability_reports/TALOS-2021-1434
|
||
|
|
Bug: https://sourceforge.net/p/sox/bugs/362/
|
||
|
|
Bug-Debian: https://bugs.debian.org/1012138
|
||
|
|
---
|
||
|
|
src/sphere.c | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/sphere.c b/src/sphere.c
|
||
|
|
index a3fd1c6..9544d16 100644
|
||
|
|
--- a/src/sphere.c
|
||
|
|
+++ b/src/sphere.c
|
||
|
|
@@ -63,7 +63,8 @@ static int start_read(sox_format_t * ft)
|
||
|
|
return (SOX_EOF);
|
||
|
|
}
|
||
|
|
|
||
|
|
- header_size -= (strlen(buf) + 1);
|
||
|
|
+ bytes_read = strlen(buf);
|
||
|
|
+ header_size -= bytes_read >= header_size ? header_size : bytes_read + 1;
|
||
|
|
|
||
|
|
while (strncmp(buf, "end_head", (size_t)8) != 0) {
|
||
|
|
if (strncmp(buf, "sample_n_bytes", (size_t)14) == 0)
|
||
|
|
@@ -105,7 +106,8 @@ static int start_read(sox_format_t * ft)
|
||
|
|
return (SOX_EOF);
|
||
|
|
}
|
||
|
|
|
||
|
|
- header_size -= (strlen(buf) + 1);
|
||
|
|
+ bytes_read = strlen(buf);
|
||
|
|
+ header_size -= bytes_read >= header_size ? header_size : bytes_read + 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (!bytes_per_sample)
|