From: Mans Rullgard <mans@mansr.com>
To: sox-devel@lists.sourceforge.net
Subject: [PATCH 4/5] amr: check for invalid block types
Date: Thu, 26 Apr 2018 22:10:35 +0100 [thread overview]
Message-ID: <20180426211036.5735-5-mans@mansr.com> (raw)
In-Reply-To: <20180426211036.5735-1-mans@mansr.com>
This fixes infinte loops and crashes with invalid inputs.
---
src/amr.h | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/amr.h b/src/amr.h
index 900bb94e0f5a..c7ea9553263a 100644
--- a/src/amr.h
+++ b/src/amr.h
@@ -74,13 +74,18 @@ typedef struct amr_priv_t {
static size_t decode_1_frame(sox_format_t * ft)
{
priv_t * p = (priv_t *)ft->priv;
- size_t n_1;
+ size_t n;
uint8_t coded[AMR_CODED_MAX];
if (lsx_readbuf(ft, &coded[0], (size_t)1) != 1)
return AMR_FRAME;
- n_1 = amr_block_size[(coded[0] >> 3) & 0x0F] - 1;
- if (lsx_readbuf(ft, &coded[1], n_1) != n_1)
+ n = amr_block_size[(coded[0] >> 3) & 0x0F];
+ if (!n) {
+ lsx_fail("invalid block type");
+ return AMR_FRAME;
+ }
+ n--;
+ if (lsx_readbuf(ft, &coded[1], n) != n)
return AMR_FRAME;
AMR_CALL(p, AmrOpencoreDecoderDecode, AmrGp3DecoderDecode, (p->state, coded, p->pcm, 0));
return 0;
@@ -160,6 +165,10 @@ static size_t amr_duration_frames(sox_format_t * ft)
for (frames = 0; lsx_readbuf(ft, &coded, (size_t)1) == 1; ++frames) {
frame_size = amr_block_size[coded >> 3 & 15];
+ if (!frame_size) {
+ lsx_fail("invalid block type");
+ break;
+ }
if (lsx_seeki(ft, frame_size - 1, SEEK_CUR)) {
lsx_fail("seek");
break;
--
2.17.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
SoX-devel mailing list
SoX-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sox-devel
next prev parent reply other threads:[~2018-04-26 21:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 21:10 [PATCH 0/5] Various bug fixes Mans Rullgard
2018-04-26 21:10 ` [PATCH 1/5] Added $(DESTDIR) in front of ${bindir} so proper sox binary is invoked during tests Mans Rullgard
2018-04-26 21:10 ` [PATCH 2/5] update FSF mailing address Mans Rullgard
2018-04-26 21:10 ` [PATCH 3/5] oss: fix input buffer overrun Mans Rullgard
2018-04-26 21:10 ` Mans Rullgard [this message]
2018-04-28 0:24 ` [PATCH 4/5] amr: check for invalid block types Eric Wong
2018-04-26 21:10 ` [PATCH 5/5] aiff: fix handling of unknown odd-sized chunks Mans Rullgard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.sourceforge.net/lists/listinfo/sox-devel
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180426211036.5735-5-mans@mansr.com \
--to=sox-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/sox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).