wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-30 11:07:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1443891. r=emk, a=RyanVM

Browse source 
MozReview-Commit-ID: AkUTNnVslMf
This commit is contained in:
Henri Sivonen 2018-03-27 15:22:31 -04:00 • committed by Roy Tam
commit 629a9a0f91
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
intl/uconv/nsScriptableUConv.cpp
View file

@ -11,6 +11,7 @@
#include "nsIUnicodeDecoder.h" #include "nsIUnicodeDecoder.h"
#include "nsIUnicodeEncoder.h" #include "nsIUnicodeEncoder.h"
#include "mozilla/dom/EncodingUtils.h" #include "mozilla/dom/EncodingUtils.h"
#include "mozilla/CheckedInt.h"
using mozilla::dom::EncodingUtils; using mozilla::dom::EncodingUtils;
@ -39,7 +40,12 @@ nsScriptableUnicodeConverter::ConvertFromUnicodeWithLength(const nsAString& aSrc
const nsAFlatString& flatSrc = PromiseFlatString(aSrc); const nsAFlatString& flatSrc = PromiseFlatString(aSrc);
rv = mEncoder->GetMaxLength(flatSrc.get(), inLength, aOutLen); rv = mEncoder->GetMaxLength(flatSrc.get(), inLength, aOutLen);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
*_retval = (char*)malloc(*aOutLen+1); mozilla::CheckedInt<int32_t> needed(*aOutLen);
needed += 1;
if (!needed.isValid()) {
return NS_ERROR_OUT_OF_MEMORY;
}
*_retval = (char*)malloc(needed.value());
if (!*_retval) if (!*_retval)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -145,7 +151,13 @@ nsScriptableUnicodeConverter::ConvertFromByteArray(const uint8_t* aData,
inLength, &outLength); inLength, &outLength);
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
{ {
char16_t* buf = (char16_t*)malloc((outLength+1) * sizeof(char16_t)); mozilla::CheckedInt<nsACString::size_type> needed(outLength);
needed += 1;
needed *= sizeof(char16_t);
if (!needed.isValid()) {
return NS_ERROR_OUT_OF_MEMORY;
}
char16_t* buf = (char16_t*)malloc(needed.value());
if (!buf) if (!buf)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;