0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 25eb00ce913452c2e614548d7df93070bf0d066f Mon Sep 17 00:00:00 2001
  2. From: Antonio Larrosa <larrosa@kde.org>
  3. Date: Mon, 6 Mar 2017 18:02:31 +0100
  4. Subject: [PATCH] clamp index values to fix index overflow in IMA.cpp
  5. This fixes #33
  6. (also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981
  7. and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/)
  8. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  9. ---
  10. libaudiofile/modules/IMA.cpp | 4 ++--
  11. 1 file changed, 2 insertions(+), 2 deletions(-)
  12. diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp
  13. index 7476d44..df4aad6 100644
  14. --- a/libaudiofile/modules/IMA.cpp
  15. +++ b/libaudiofile/modules/IMA.cpp
  16. @@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded)
  17. if (encoded[1] & 0x80)
  18. m_adpcmState[c].previousValue -= 0x10000;
  19. - m_adpcmState[c].index = encoded[2];
  20. + m_adpcmState[c].index = clamp(encoded[2], 0, 88);
  21. *decoded++ = m_adpcmState[c].previousValue;
  22. @@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded)
  23. predictor -= 0x10000;
  24. state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16);
  25. - state.index = encoded[1] & 0x7f;
  26. + state.index = clamp(encoded[1] & 0x7f, 0, 88);
  27. encoded += 2;
  28. for (int n=0; n<m_framesPerPacket; n+=2)
  29. --
  30. 2.11.0