Skip to content

Commit

Permalink
clamp index values to fix index overflow in IMA.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
antlarr authored and sbaldovi committed May 30, 2023
1 parent b62c902 commit 3b15b6b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libaudiofile/modules/IMA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded)
if (encoded[1] & 0x80)
m_adpcmState[c].previousValue -= 0x10000;

m_adpcmState[c].index = encoded[2];
m_adpcmState[c].index = clamp(encoded[2], 0, 88);

*decoded++ = m_adpcmState[c].previousValue;

Expand Down Expand Up @@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded)
predictor -= 0x10000;

state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16);
state.index = encoded[1] & 0x7f;
state.index = clamp(encoded[1] & 0x7f, 0, 88);
encoded += 2;

for (int n=0; n<m_framesPerPacket; n+=2)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From: Antonio Larrosa <[email protected]>
Date: Mon, 6 Mar 2017 18:02:31 +0100
Subject: clamp index values to fix index overflow in IMA.cpp

This fixes #33
(also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981
and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/)
---
libaudiofile/modules/IMA.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp
index 7476d44..df4aad6 100644
--- a/libaudiofile/modules/IMA.cpp
+++ b/libaudiofile/modules/IMA.cpp
@@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded)
if (encoded[1] & 0x80)
m_adpcmState[c].previousValue -= 0x10000;

- m_adpcmState[c].index = encoded[2];
+ m_adpcmState[c].index = clamp(encoded[2], 0, 88);

*decoded++ = m_adpcmState[c].previousValue;

@@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded)
predictor -= 0x10000;

state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16);
- state.index = encoded[1] & 0x7f;
+ state.index = clamp(encoded[1] & 0x7f, 0, 88);
encoded += 2;

for (int n=0; n<m_framesPerPacket; n+=2)

0 comments on commit 3b15b6b

Please sign in to comment.