зеркало из https://github.com/mozilla/gecko-dev.git
Bug 737164 - Make ReadInputStreamToString fallible. r=bsmedberg
This commit is contained in:
Родитель
f55d4cb175
Коммит
d6ef5f87ed
|
@ -1194,18 +1194,22 @@ NS_ReadInputStreamToBuffer(nsIInputStream *aInputStream,
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// external code can't see fallible_t
|
||||||
|
#ifdef MOZILLA_INTERNAL_API
|
||||||
|
|
||||||
inline nsresult
|
inline nsresult
|
||||||
NS_ReadInputStreamToString(nsIInputStream *aInputStream,
|
NS_ReadInputStreamToString(nsIInputStream *aInputStream,
|
||||||
nsACString &aDest,
|
nsACString &aDest,
|
||||||
PRUint32 aCount)
|
PRUint32 aCount)
|
||||||
{
|
{
|
||||||
aDest.SetLength(aCount);
|
if (!aDest.SetLength(aCount, mozilla::fallible_t()))
|
||||||
if (aDest.Length() != aCount)
|
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
return NS_ERROR_OUT_OF_MEMORY;
|
||||||
void* dest = aDest.BeginWriting();
|
void* dest = aDest.BeginWriting();
|
||||||
return NS_ReadInputStreamToBuffer(aInputStream, &dest, aCount);
|
return NS_ReadInputStreamToBuffer(aInputStream, &dest, aCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
inline nsresult
|
inline nsresult
|
||||||
NS_LoadPersistentPropertiesFromURI(nsIPersistentProperties **result,
|
NS_LoadPersistentPropertiesFromURI(nsIPersistentProperties **result,
|
||||||
nsIURI *uri,
|
nsIURI *uri,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче