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

WIP: Testing: Add aborts on overreads

This commit is contained in:
Martin Storsjo 2018-09-01 00:19:10 +03:00
parent 1c6ad60e83
commit 4edef6b48b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libFDK/src/FDK_bitbuffer.cpp
View File

@ -106,6 +106,8 @@ amm-info@iis.fraunhofer.de
#include "common_fix.h" #include "common_fix.h"
#include "fixminmax.h" #include "fixminmax.h"
#include <stdlib.h>
const UINT BitMask[32 + 1] = { const UINT BitMask[32 + 1] = {
0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f,
0x3f, 0x7f, 0xff, 0x1ff, 0x3ff, 0x7ff, 0x3f, 0x7f, 0xff, 0x1ff, 0x3ff, 0x7ff,
@ -157,7 +159,11 @@ void FDK_ResetBitBuffer(HANDLE_FDK_BITBUF hBitBuf) {
#ifndef FUNCTION_FDK_get #ifndef FUNCTION_FDK_get
INT FDK_get(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits) { INT FDK_get(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits) {
if (numberOfBits == 0 || numberOfBits > hBitBuf->ValidBits) return 0; if (numberOfBits == 0 || numberOfBits > hBitBuf->ValidBits) {
if (numberOfBits > hBitBuf->ValidBits)
abort();
return 0;
}
UINT byteOffset = hBitBuf->BitNdx >> 3; UINT byteOffset = hBitBuf->BitNdx >> 3;
UINT bitOffset = hBitBuf->BitNdx & 0x07; UINT bitOffset = hBitBuf->BitNdx & 0x07;
@ -181,7 +187,10 @@ INT FDK_get(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits) {
#ifndef FUNCTION_FDK_get32 #ifndef FUNCTION_FDK_get32
INT FDK_get32(HANDLE_FDK_BITBUF hBitBuf) { INT FDK_get32(HANDLE_FDK_BITBUF hBitBuf) {
if (hBitBuf->ValidBits < 32) return 0; if (hBitBuf->ValidBits < 32) {
abort();
return 0;
}
UINT BitNdx = hBitBuf->BitNdx + 32; UINT BitNdx = hBitBuf->BitNdx + 32;
hBitBuf->BitNdx = BitNdx & (hBitBuf->bufBits - 1); hBitBuf->BitNdx = BitNdx & (hBitBuf->bufBits - 1);