Bug 1021494 - Fix a compiler error with clang-cl in nsScriptableInputStream.cpp; r=froydnj

--HG--
extra : rebase_source : ec8db04ca59e87caed2f523ccc1b3dd645ab37c2
This commit is contained in:
Ehsan Akhgari 2014-06-06 18:56:07 -04:00
parent 176e414851
commit 87daba2982

View File

@ -55,7 +55,7 @@ nsScriptableInputStream::Read(uint32_t aCount, char** aResult)
}
// bug716556 - Ensure count+1 doesn't overflow
uint32_t count = XPCOM_MIN((uint32_t)XPCOM_MIN<uint64_t>(count64, aCount), UINT32_MAX - 1);
uint32_t count = XPCOM_MIN(uint32_t(XPCOM_MIN<uint64_t>(count64, aCount)), uint32_t(UINT32_MAX - 1));
buffer = (char*)moz_malloc(count + 1); // make room for '\0'
if (!buffer) {
return NS_ERROR_OUT_OF_MEMORY;