diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2021-05-07 22:12:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 22:12:02 +0000 |
| commit | 7e3add342f03e5a15671c8e1da86258e344f8c86 (patch) | |
| tree | a6dceaf07cea85442326ca2c42b05022a6b977d0 /libAACenc/src | |
| parent | 3db8ac7a00d2764cd5a689dabe07ef7cfe76d865 (diff) | |
| parent | bac4f0675f8294fad940a36a6fb32dc3ac5f1c14 (diff) | |
| download | fdk-aac-7e3add342f03e5a15671c8e1da86258e344f8c86.tar.gz fdk-aac-7e3add342f03e5a15671c8e1da86258e344f8c86.tar.bz2 fdk-aac-7e3add342f03e5a15671c8e1da86258e344f8c86.zip | |
Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 am: bac4f0675f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062
Change-Id: I63ae90c7288f72ce534c33d04bb534b23244d396
Diffstat (limited to 'libAACenc/src')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index caa62c5..c11db27 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -2521,6 +2521,11 @@ AACENC_ERROR aacEncInfo(const HANDLE_AACENCODER hAacEncoder, AACENC_InfoStruct *pInfo) { AACENC_ERROR err = AACENC_OK; + if ((hAacEncoder == NULL) || (pInfo == NULL)) { + err = AACENC_INVALID_HANDLE; + goto bail; + } + FDKmemclear(pInfo, sizeof(AACENC_InfoStruct)); pInfo->confSize = 64; /* pre-initialize */ |