From e461c0558c87a327c5a133efbcb5295e85c7d7f5 Mon Sep 17 00:00:00 2001 From: cqian2 Date: Mon, 19 Sep 2022 15:52:35 +0800 Subject: [PATCH] Fix the 32 bit build regression --- media_softlet/agnostic/common/os/mos_utilities.h | 5 +++++ .../linux/common/os/osservice/mos_utilities_specific.cpp | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/media_softlet/agnostic/common/os/mos_utilities.h b/media_softlet/agnostic/common/os/mos_utilities.h index 252390aebe9..3ccdc75fad8 100644 --- a/media_softlet/agnostic/common/os/mos_utilities.h +++ b/media_softlet/agnostic/common/os/mos_utilities.h @@ -2841,6 +2841,11 @@ template inline _Ty* MosUtilities::MosNewArrayUtil(size_t numElements) #endif { + if (numElements > PTRDIFF_MAX) + { + return nullptr; + } + #if (_DEBUG || _RELEASE_INTERNAL) //Simulate allocate memory fail if flag turned on if (MosSimulateAllocMemoryFail(sizeof(_Ty) * numElements, NO_ALLOC_ALIGNMENT, functionName, filename, line)) diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp index 502751d52c1..d73870848dc 100644 --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp @@ -44,7 +44,7 @@ #include "mos_utilities_specific.h" #include "mos_utilities.h" #include "mos_util_debug.h" - +#include "inttypes.h" const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE; MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr; @@ -1020,8 +1020,7 @@ MOS_STATUS MosUtilitiesSpecificNext::UserFeatureDumpDataToFile(const char *szFil *(uint32_t*)(pKeyTmp->pElem->pValueArray[j].ulValueBuf)); break; case UF_QWORD: - fprintf(File, "\t\t\t%lu\n", - *(uint64_t*)(pKeyTmp->pElem->pValueArray[j].ulValueBuf)); + fprintf(File, "\t\t\t%" PRIu64"\n", *(uint64_t*)(pKeyTmp->pElem->pValueArray[j].ulValueBuf)); break; default: fprintf(File, "\t\t\t%s\n",