Merge pull request #206 from adamjw24/develop_v300rc4

Fix ASAN and bump version to 3.0.0rc3
fraunhoferhhi · Oct 14, 2024 · 2dab52c · 2dab52c
2 parents 4426cde + ddef5eb
commit 2dab52c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_policy( VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} )
 # project name
 project( vvdec VERSION 3.0.0 )
 # set alternative version numbering for release candidates
-set( PROJECT_VERSION_RC rc2 )
+set( PROJECT_VERSION_RC rc3 )
 if( PROJECT_VERSION_RC )
     set( PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_RC}" )
 endif()

diff --git a/source/Lib/CommonLib/Quant.cpp b/source/Lib/CommonLib/Quant.cpp
@@ -539,6 +539,9 @@ bool Quant::xSetScalingListDec(const ScalingList &scalingList, uint32_t listId,
 {
   const uint32_t width  = g_vvcScalingListSizeX[sizeId];
   const uint32_t height = g_vvcScalingListSizeX[sizeId];
+#if defined( __SANITIZE_ADDRESS__ )   // work around a bug in GCC address-sanitizer, when building with -fsanitize=address, but without -fsanitize=undefined
+  volatile
+#endif
   const uint32_t ratio  = g_vvcScalingListSizeX[sizeId]/std::min(MAX_MATRIX_SIZE_NUM,(int)g_vvcScalingListSizeX[sizeId]);
 
   const int *coeff = scalingList.getScalingListAddress(scalingListId);