зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 68f1bedc4fd5 (bug 1812038) for causing build bustages in nsJARInputStream.cpp
This commit is contained in:
Родитель
3e6600cc63
Коммит
39c144a88f
|
@ -9,7 +9,6 @@
|
|||
#include "zipstruct.h" // defines ZIP compression codes
|
||||
#include "nsZipArchive.h"
|
||||
#include "mozilla/MmapFaultHandler.h"
|
||||
#include "mozilla/StaticPrefs_network.h"
|
||||
#include "mozilla/UniquePtr.h"
|
||||
#include "mozilla/UniquePtrExtensions.h"
|
||||
|
||||
|
@ -155,8 +154,6 @@ nsJARInputStream::Available(uint64_t* _retval) {
|
|||
// They just use the _retval value.
|
||||
*_retval = 0;
|
||||
|
||||
uint64_t maxAvailableSize = 0;
|
||||
|
||||
switch (mMode) {
|
||||
case MODE_NOTINITED:
|
||||
break;
|
||||
|
@ -170,11 +167,7 @@ nsJARInputStream::Available(uint64_t* _retval) {
|
|||
|
||||
case MODE_INFLATE:
|
||||
case MODE_COPY:
|
||||
maxAvailableSize = StaticPrefs::network_jar_max_available_size();
|
||||
if (!maxAvailableSize) {
|
||||
maxAvailableSize = std::numeric_limits<uint64_t>::max();
|
||||
}
|
||||
*_retval = std::min(mOutSize - mZs.total_out, maxAvailableSize);
|
||||
*_retval = mOutSize - mZs.total_out;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -12593,13 +12593,6 @@
|
|||
value: @IS_EARLY_BETA_OR_EARLIER@
|
||||
mirror: always
|
||||
|
||||
# nsJARInputStream::Available returns the size indicated by the archived entry
|
||||
# so we need a limit so we don't OOM if the archive is corrupted.
|
||||
- name: network.jar.max_available_size
|
||||
type: RelaxedAtomicUint32
|
||||
value: 256*1024*1024 # 256 Mb
|
||||
mirror: always
|
||||
|
||||
# When this pref is true we clear the Content-Encoding header for
|
||||
# application/x-gzip Content-Type responses, see bug 1030660.
|
||||
#
|
||||
|
|
Загрузка…
Ссылка в новой задаче