From c2416f5e9360db0a6a3578fff087392fc7656f38 Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Tue, 16 Mar 2021 14:51:32 +0100 Subject: [PATCH] Add parameter pointer check to aacEncInfo() encoder API function. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5d758d2708a613382d9ad6d02a9dbe46ae2ef0cf --- documentation/aacEncoder.pdf | Bin 443728 -> 443831 bytes libAACenc/include/aacenc_lib.h | 4 ++-- libAACenc/src/aacenc_lib.cpp | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/documentation/aacEncoder.pdf b/documentation/aacEncoder.pdf index 77b8f4cc2210d75dc2e0588f940a07ab370b7dd7..a47708a940e5b2218c0a2eebcb2ea2f4334943e3 100644 GIT binary patch delta 8063 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 delta 7974 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 diff --git a/libAACenc/include/aacenc_lib.h b/libAACenc/include/aacenc_lib.h index 71f7556..f0f23b4 100644 --- a/libAACenc/include/aacenc_lib.h +++ b/libAACenc/include/aacenc_lib.h @@ -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 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1643,7 +1643,7 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, * * \return * - AACENC_OK, on succes. - * - AACENC_INIT_ERROR, on failure. + * - AACENC_INVALID_HANDLE, AACENC_INIT_ERROR, on failure. */ AACENC_ERROR aacEncInfo(const HANDLE_AACENCODER hAacEncoder, AACENC_InfoStruct *pInfo); 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 */