diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/third_party/lzma_sdk | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
| download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/lzma_sdk')
| -rw-r--r-- | chromium/third_party/lzma_sdk/README.chromium | 3 | ||||
| -rw-r--r-- | chromium/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c | 2 | ||||
| -rw-r--r-- | chromium/third_party/lzma_sdk/Util/SfxSetup/chromium.patch | 25 |
3 files changed, 27 insertions, 3 deletions
diff --git a/chromium/third_party/lzma_sdk/README.chromium b/chromium/third_party/lzma_sdk/README.chromium index 96fc788132b..956b8d6c2fa 100644 --- a/chromium/third_party/lzma_sdk/README.chromium +++ b/chromium/third_party/lzma_sdk/README.chromium @@ -28,4 +28,5 @@ The patch in Util/SfxSetup/chromium.patch was applied so that: C6246: Local declaration hides declaration of same name in outer scope. 2/ Fix for includes file names, since the original code causes an include file violation during git cl presubmit. - +3/ Extended search range for 7z archive signature to accomodate + increased sfx binary size in debug builds. diff --git a/chromium/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c b/chromium/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c index 967c5c24770..95766a6a2dd 100644 --- a/chromium/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c +++ b/chromium/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c @@ -125,7 +125,7 @@ static WRes MyCreateDir(const WCHAR *name) #define kBufferSize (1 << 15) #endif -#define kSignatureSearchLimit (1 << 22) +#define kSignatureSearchLimit (1 << 26) static Bool FindSignature(CSzFile *stream, UInt64 *resPos) { diff --git a/chromium/third_party/lzma_sdk/Util/SfxSetup/chromium.patch b/chromium/third_party/lzma_sdk/Util/SfxSetup/chromium.patch index 2414073cc47..68d128258e2 100644 --- a/chromium/third_party/lzma_sdk/Util/SfxSetup/chromium.patch +++ b/chromium/third_party/lzma_sdk/Util/SfxSetup/chromium.patch @@ -30,4 +30,27 @@ diff \Users\rogerta\Documents\Visual Studio 2017\Projects\7z.1514.orig\C\Util\Sf < unsigned extPrice = FindItem(kExts, sizeof(kExts) / sizeof(kExts[0]), name + len - extLen, extLen); --- > unsigned extPrice = FindItem(kExts, sizeof(kExts) / sizeof(kExts[0]), name + len2 - extLen, extLen); - +diff --git a/third_party/lzma_sdk/README.chromium b/third_party/lzma_sdk/README.chromium +index 96fc788132b2..956b8d6c2fae 100644 +--- a/third_party/lzma_sdk/README.chromium ++++ b/third_party/lzma_sdk/README.chromium +@@ -28,4 +28,5 @@ The patch in Util/SfxSetup/chromium.patch was applied so that: + C6246: Local declaration hides declaration of same name in outer scope. + 2/ Fix for includes file names, since the original code causes an include + file violation during git cl presubmit. +- ++3/ Extended search range for 7z archive signature to accomodate ++ increased sfx binary size in debug builds. +diff --git a/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c b/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c +index 967c5c247702..95766a6a2dd4 100644 +--- a/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c ++++ b/third_party/lzma_sdk/Util/SfxSetup/SfxSetup.c +@@ -125,7 +125,7 @@ static WRes MyCreateDir(const WCHAR *name) + #define kBufferSize (1 << 15) + #endif + +-#define kSignatureSearchLimit (1 << 22) ++#define kSignatureSearchLimit (1 << 26) + + static Bool FindSignature(CSzFile *stream, UInt64 *resPos) + { |