diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2020-04-09 17:54:50 +0200 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2020-12-28 09:21:16 -0800 |
| commit | 293ccc7fbc509cc0ba4d944bd1bb9ad6f79c037d (patch) | |
| tree | af4709c9384f87840b2315f85268dcd25d7251a6 /libAACdec | |
| parent | 883c1143990c6d41abdadcb18cf8d084aeb8630d (diff) | |
| download | fdk-aac-293ccc7fbc509cc0ba4d944bd1bb9ad6f79c037d.tar.gz fdk-aac-293ccc7fbc509cc0ba4d944bd1bb9ad6f79c037d.tar.bz2 fdk-aac-293ccc7fbc509cc0ba4d944bd1bb9ad6f79c037d.zip | |
Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD().
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I5eb0f88a55e856c427f9e4647332070f66e673c5
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdec_hcrs.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libAACdec/src/aacdec_hcrs.cpp b/libAACdec/src/aacdec_hcrs.cpp index 44b32a5..5e3f9ac 100644 --- a/libAACdec/src/aacdec_hcrs.cpp +++ b/libAACdec/src/aacdec_hcrs.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -173,7 +173,9 @@ void DecodeNonPCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) { pHcr->segmentInfo.readDirection = FROM_RIGHT_TO_LEFT; /* Process sets subsequently */ + numSet = fMin(numSet, (UCHAR)MAX_HCR_SETS); for (currentSet = 1; currentSet < numSet; currentSet++) { + /* step 1 */ numCodeword -= *pNumSegment; /* number of remaining non PCWs [for all sets] */ |