From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 modules/libjar/nsZipArchive.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'modules/libjar/nsZipArchive.cpp')

diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp
index e0ca373e49..2d845f25f0 100644
--- a/modules/libjar/nsZipArchive.cpp
+++ b/modules/libjar/nsZipArchive.cpp
@@ -17,6 +17,7 @@
 #include "mozilla/MemUtils.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/StaticMutex.h"
+#include "mozilla/StaticPrefs_network.h"
 #include "stdlib.h"
 #include "nsDirectoryService.h"
 #include "nsWildCard.h"
@@ -242,6 +243,15 @@ nsresult nsZipHandle::Init(nsZipArchive* zip, const char* entry,
   if (!handle) return NS_ERROR_OUT_OF_MEMORY;
 
   LOG(("ZipHandle::Init entry %s", entry));
+
+  nsZipItem* item = zip->GetItem(entry);
+  if (item && item->Compression() == DEFLATED &&
+      StaticPrefs::network_jar_max_entry_size()) {
+    if (item->RealSize() > StaticPrefs::network_jar_max_entry_size()) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+
   handle->mBuf = MakeUnique<nsZipItemPtr<uint8_t>>(zip, entry);
   if (!handle->mBuf) return NS_ERROR_OUT_OF_MEMORY;
 
-- 
cgit v1.2.3