summaryrefslogtreecommitdiffstats
path: root/xpcom
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 02:30:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 02:30:12 +0000
commitac282b5848d90db100955fee6ce47745f67e0f40 (patch)
treea7f1cb23c9be53cc524781feccc0ad1f5a59ab97 /xpcom
parentReleasing progress-linux version 115.8.0esr-1~progress7.99u1. (diff)
downloadfirefox-esr-ac282b5848d90db100955fee6ce47745f67e0f40.tar.xz
firefox-esr-ac282b5848d90db100955fee6ce47745f67e0f40.zip
Merging upstream version 115.9.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom')
-rw-r--r--xpcom/build/XPCOMInit.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp
index cd6c7f7052..61e29ababd 100644
--- a/xpcom/build/XPCOMInit.cpp
+++ b/xpcom/build/XPCOMInit.cpp
@@ -164,11 +164,19 @@ class ICUReporter final : public nsIMemoryReporter,
NS_DECL_ISUPPORTS
static void* Alloc(const void*, size_t aSize) {
- return CountingMalloc(aSize);
+ void* result = CountingMalloc(aSize);
+ if (result == nullptr) {
+ MOZ_CRASH("Ran out of memory while allocating for ICU");
+ }
+ return result;
}
static void* Realloc(const void*, void* aPtr, size_t aSize) {
- return CountingRealloc(aPtr, aSize);
+ void* result = CountingRealloc(aPtr, aSize);
+ if (result == nullptr) {
+ MOZ_CRASH("Ran out of memory while reallocating for ICU");
+ }
+ return result;
}
static void Free(const void*, void* aPtr) { return CountingFree(aPtr); }