diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-31 04:20:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-31 04:20:18 +0000 |
| commit | d2ffcd68adb7f00254255e81dec205ffa67a8758 (patch) | |
| tree | 45c8b795b34a9ce7fb67908b735acd88bb80f823 /libAACdec/src/aacdec_hcrs.cpp | |
| parent | cdc84f84e9fb9399ce410ce3c05332ffd442aad0 (diff) | |
| parent | 47b23c88cfe81bbcc9ff0c8de1608283de18a475 (diff) | |
| download | fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.tar.gz fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.tar.bz2 fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.zip | |
Snap for 6104206 from 47b23c88cfe81bbcc9ff0c8de1608283de18a475 to rvc-release
Change-Id: I37ae8a78b271948e025a2e6c071453480dcc9a52
Diffstat (limited to 'libAACdec/src/aacdec_hcrs.cpp')
| -rw-r--r-- | libAACdec/src/aacdec_hcrs.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libAACdec/src/aacdec_hcrs.cpp b/libAACdec/src/aacdec_hcrs.cpp index d2bc867..44b32a5 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 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1324,6 +1324,10 @@ UINT Hcr_State_BODY_SIGN_ESC__ESC_PREFIX(HANDLE_FDK_BITSTREAM bs, void *ptr) { /* count ones and store sum in escapePrefixUp */ if (carryBit == 1) { escapePrefixUp += 1; /* update conter for ones */ + if (escapePrefixUp > 8) { + pHcr->decInOut.errorLog |= STATE_ERROR_BODY_SIGN_ESC__ESC_PREFIX; + return BODY_SIGN_ESC__ESC_PREFIX; + } /* store updated counter in sideinfo of current codeword */ pEscapeSequenceInfo[codewordOffset] &= |