Skip to content

Commit e461c05

Browse files
cqian2Sherry-Lin
authored andcommitted
Fix the 32 bit build regression
1 parent caf9a14 commit e461c05

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

media_softlet/agnostic/common/os/mos_utilities.h

+5
Original file line numberDiff line numberDiff line change
@@ -2841,6 +2841,11 @@ template<class _Ty, class... _Types> inline
28412841
_Ty* MosUtilities::MosNewArrayUtil(size_t numElements)
28422842
#endif
28432843
{
2844+
if (numElements > PTRDIFF_MAX)
2845+
{
2846+
return nullptr;
2847+
}
2848+
28442849
#if (_DEBUG || _RELEASE_INTERNAL)
28452850
//Simulate allocate memory fail if flag turned on
28462851
if (MosSimulateAllocMemoryFail(sizeof(_Ty) * numElements, NO_ALLOC_ALIGNMENT, functionName, filename, line))

media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "mos_utilities_specific.h"
4545
#include "mos_utilities.h"
4646
#include "mos_util_debug.h"
47-
47+
#include "inttypes.h"
4848

4949
const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE;
5050
MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr;
@@ -1020,8 +1020,7 @@ MOS_STATUS MosUtilitiesSpecificNext::UserFeatureDumpDataToFile(const char *szFil
10201020
*(uint32_t*)(pKeyTmp->pElem->pValueArray[j].ulValueBuf));
10211021
break;
10221022
case UF_QWORD:
1023-
fprintf(File, "\t\t\t%lu\n",
1024-
*(uint64_t*)(pKeyTmp->pElem->pValueArray[j].ulValueBuf));
1023+
fprintf(File, "\t\t\t%" PRIu64"\n", *(uint64_t*)(pKeyTmp->pElem->pValueArray[j].ulValueBuf));
10251024
break;
10261025
default:
10271026
fprintf(File, "\t\t\t%s\n",

0 commit comments

Comments
 (0)