fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0f am: e0624f4c05 

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: Icfe1613791fb53502d99e3030dd9e9baa3fa5c33
This commit is contained in:
Jean-Michel Trivi 2020-07-10 18:12:12 +00:00 committed by Automerger Merge Worker
parent c2d9dc1ab3 e0624f4c05
commit 73da86e336
1 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
fuzzer/aac_dec_fuzzer.cpp
View File

@ -19,10 +19,58 @@
*/
#include <stdint.h>
#include <string.h>
#include <algorithm>
#include "aacdecoder_lib.h"
constexpr uint8_t kNumberOfLayers = 1;
constexpr uint8_t kMaxChannelCount = 8;
constexpr uint32_t kMaxConfigurationSize = 1024;
constexpr uint32_t kMaxOutBufferSize = 2048 * kMaxChannelCount;
// Value indicating the start of AAC Header Segment
constexpr const char *kAacSegStartSeq = "AAC_STRT";
constexpr uint8_t kAacSegStartSeqLen = sizeof(kAacSegStartSeq);
// Value indicating the end of AAC Header Segment
constexpr const char *kAacSegEndSeq = "AAC_ENDS";
constexpr uint8_t kAacSegEndSeqLen = sizeof(kAacSegEndSeq);
// Number of bytes used to signal the length of the header
constexpr uint8_t kHeaderLengthBytes = 2;
// Minimum size of an AAC header is 2
// Minimum data required is
// strlen(AAC_STRT) + strlen(AAC_ENDS) + kHeaderLengthBytes + 2;
constexpr UINT kMinDataSize = kAacSegStartSeqLen + kAacSegEndSeqLen + kHeaderLengthBytes + 2;
UINT getHeaderSize(UCHAR *data, UINT size) {
if (size < kMinDataSize) {
return 0;
}
int32_t result = memcmp(data, kAacSegStartSeq, kAacSegStartSeqLen);
if (result) {
return 0;
}
data += kAacSegStartSeqLen;
size -= kAacSegStartSeqLen;
uint32_t headerLengthInBytes = (data[0] << 8 | data[1]) & 0xFFFF;
data += kHeaderLengthBytes;
size -= kHeaderLengthBytes;
if (headerLengthInBytes + kAacSegEndSeqLen > size) {
return 0;
}
data += headerLengthInBytes;
size -= headerLengthInBytes;
result = memcmp(data, kAacSegEndSeq, kAacSegEndSeqLen);
if (result) {
return 0;
}
return std::min(headerLengthInBytes, kMaxConfigurationSize);
}
class Codec {
public:
@ -51,6 +99,14 @@ void Codec::deInitDecoder() {
}
void Codec::decodeFrames(UCHAR *data, UINT size) {
UINT headerSize = getHeaderSize(data, size);
if (headerSize != 0) {
data += kAacSegStartSeqLen + kHeaderLengthBytes;
size -= kAacSegStartSeqLen + kHeaderLengthBytes;
aacDecoder_ConfigRaw(mAacDecoderHandle, &data, &headerSize);
data += headerSize + kAacSegEndSeqLen;
size -= headerSize + kAacSegEndSeqLen;
}
while (size > 0) {
UINT inputSize = size;
UINT valid = size;
@ -59,11 +115,11 @@ void Codec::decodeFrames(UCHAR *data, UINT size) {
++data;
--size;
} else {
INT_PCM outputBuf[2048 * kMaxChannelCount];
aacDecoder_DecodeFrame(mAacDecoderHandle, outputBuf, 2048 * kMaxChannelCount, 0);
if (valid >= inputSize) {
return;
}
INT_PCM outputBuf[kMaxOutBufferSize];
do {
mErrorCode =
aacDecoder_DecodeFrame(mAacDecoderHandle, outputBuf, sizeof(outputBuf), 0);
} while (mErrorCode == AAC_DEC_OK);
UINT offset = inputSize - valid;
data += offset;
size = valid;