forked from mpruett/audiofile
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
clamp index values to fix index overflow in IMA.cpp
This fixes mpruett#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/)
- Loading branch information
Showing
2 changed files
with
35 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
patches/04_clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |