diff --git a/lib_com/options.h b/lib_com/options.h index 5ea186b47f68778151863839dc9bf49845be837e..38bbbc7a5474e70066d94f156692f96152f0702c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -115,6 +115,7 @@ #define NONBE_1303_REND_GRANULARITY /* VA: issue 1303: Renderer granularity revision */ #define FIX_1384_MSAN_ivas_spar_dec_open /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */ #define FIX_1388_MSAN_ivas_init_decoder /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */ +#define FIX_1288_SPLIT_REND_XSAN /* Dlb: Fix asan, msan and usan issues in split rendering mode*/ // object-editing feature porting #define OBJ_EDITING_API /* object editing changes related to the API */ diff --git a/lib_lc3plus/lc3.c b/lib_lc3plus/lc3.c index 2d3fbb51e171c3d1c86d7b9fd57b31930687d369..e8a73aec84ba5e03673a8bd14618fe963c4f597e 100644 --- a/lib_lc3plus/lc3.c +++ b/lib_lc3plus/lc3.c @@ -121,9 +121,9 @@ static int null_in_list(void **list, int n) /* return pointer to aligned base + base_size, *base_size += size + 4 bytes align */ void *balloc(void *base, size_t *base_size, size_t size) { - uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & ~3; + uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & (uintptr_t)(~3); assert((uintptr_t)base % 4 == 0); /* base must be 4-byte aligned */ - *base_size = (*base_size + size + 3) & ~3; + *base_size = (*base_size + size + 3) & (uintptr_t)(~3); return (void *)ptr; }