eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-07 16:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Avoid undefined behaviour within the debug macros

Browse source 
Even when the macro itself would overflow.

Reviewed by Mark Harris
This commit is contained in:
Jean-Marc Valin 2022-07-03 03:25:59 -04:00
parent 68d21fb5b0
commit 8489ff3ffa
No known key found for this signature in database
GPG key ID: 531A52533318F00A
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
silk/MacroDebug.h
View file

@ -55,7 +55,7 @@ static OPUS_INLINE opus_int16 silk_ADD16_(opus_int16 a, opus_int16 b, char *file
static OPUS_INLINE opus_int32 silk_ADD32_(opus_int32 a, opus_int32 b, char *file, int line){ static OPUS_INLINE opus_int32 silk_ADD32_(opus_int32 a, opus_int32 b, char *file, int line){
opus_int32 ret; opus_int32 ret;
ret = a + b; ret = (opus_int32)((opus_uint32)a + (opus_uint32)b);
if ( ret != silk_ADD_SAT32( a, b ) ) if ( ret != silk_ADD_SAT32( a, b ) )
{ {
fprintf (stderr, "silk_ADD32(%d, %d) in %s: line %d\n", a, b, file, line); fprintf (stderr, "silk_ADD32(%d, %d) in %s: line %d\n", a, b, file, line);
@ -257,7 +257,7 @@ static OPUS_INLINE opus_int64 silk_SUB_SAT64_( opus_int64 a64, opus_int64 b64, c
static OPUS_INLINE opus_int32 silk_MUL_(opus_int32 a32, opus_int32 b32, char *file, int line){ static OPUS_INLINE opus_int32 silk_MUL_(opus_int32 a32, opus_int32 b32, char *file, int line){
opus_int32 ret; opus_int32 ret;
opus_int64 ret64; opus_int64 ret64;
ret = a32 * b32; ret = (opus_int32)((opus_uint32)a32 * (opus_uint32)b32);
ret64 = (opus_int64)a32 * (opus_int64)b32; ret64 = (opus_int64)a32 * (opus_int64)b32;
if ( (opus_int64)ret != ret64 ) if ( (opus_int64)ret != ret64 )
{ {