mirrors/zstd
0
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2024-12-15 08:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some minor sanitizer warnings within huff0

Browse Source
This commit is contained in:
Yann Collet 2015-07-27 20:19:21 +01:00
parent fb8296f55c
commit 138db2187d
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/fse.c
View File

@ -138,6 +138,38 @@ static unsigned FSE_isLittleEndian(void)
return one.c[0]; return one.c[0];
} }
static U16 FSE_read16(const void* memPtr)
{
U16 val;
memcpy(&val, memPtr, sizeof(val));
return val;
}
static U16 FSE_readLE16(const void* memPtr)
{
if (FSE_isLittleEndian())
return FSE_read16(memPtr);
else
{
const BYTE* p = (const BYTE*)memPtr;
return (U16)(p[0] + (p[1]<<8));
}
}
static void FSE_writeLE16(void* memPtr, U16 val)
{
if (FSE_isLittleEndian())
{
memcpy(memPtr, &val, sizeof(val));
}
else
{
BYTE* p = (BYTE*)memPtr;
p[0] = (BYTE)val;
p[1] = (BYTE)(val>>8);
}
}
static U32 FSE_read32(const void* memPtr) static U32 FSE_read32(const void* memPtr)
{ {
U32 val32; U32 val32;
@ -1958,7 +1990,7 @@ static size_t HUF_compress_usingCTable(void* dst, size_t dstSize, const void* sr
FSE_flushBits(&bitC); FSE_flushBits(&bitC);
} }
streamSize = FSE_closeCStream(&bitC); streamSize = FSE_closeCStream(&bitC);
jumpTable[0] = (U16)streamSize; FSE_writeLE16(jumpTable, (U16)streamSize);
op += streamSize; op += streamSize;
FSE_initCStream(&bitC, op); FSE_initCStream(&bitC, op);
@ -1975,7 +2007,7 @@ static size_t HUF_compress_usingCTable(void* dst, size_t dstSize, const void* sr
FSE_flushBits(&bitC); FSE_flushBits(&bitC);
} }
streamSize = FSE_closeCStream(&bitC); streamSize = FSE_closeCStream(&bitC);
jumpTable[1] = (U16)streamSize; FSE_writeLE16(jumpTable+1, (U16)streamSize);
op += streamSize; op += streamSize;
FSE_initCStream(&bitC, op); FSE_initCStream(&bitC, op);
@ -1992,7 +2024,7 @@ static size_t HUF_compress_usingCTable(void* dst, size_t dstSize, const void* sr
FSE_flushBits(&bitC); FSE_flushBits(&bitC);
} }
streamSize = FSE_closeCStream(&bitC); streamSize = FSE_closeCStream(&bitC);
jumpTable[2] = (U16)streamSize; FSE_writeLE16(jumpTable+2, (U16)streamSize);
op += streamSize; op += streamSize;
FSE_initCStream(&bitC, op); FSE_initCStream(&bitC, op);
@ -2170,9 +2202,9 @@ static size_t HUF_decompress_usingDTable(
/* Init */ /* Init */
const U16* jumpTable = (const U16*)cSrc; const U16* jumpTable = (const U16*)cSrc;
const size_t length1 = jumpTable[0]; const size_t length1 = FSE_readLE16(jumpTable);
const size_t length2 = jumpTable[1]; const size_t length2 = FSE_readLE16(jumpTable+1);
const size_t length3 = jumpTable[2]; const size_t length3 = FSE_readLE16(jumpTable+2);
const size_t length4 = cSrcSize - 6 - length1 - length2 - length3; // check coherency !! const size_t length4 = cSrcSize - 6 - length1 - length2 - length3; // check coherency !!
const char* const start1 = (const char*)(cSrc) + 6; const char* const start1 = (const char*)(cSrc) + 6;
const char* const start2 = start1 + length1; const char* const start2 = start1 + length1;