mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

p7zip: refresh patches

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.vom>
This commit is contained in:
Armin Kuster
2022-03-10 05:25:06 +00:00
committed by Armin Kuster
parent 7334bc295d
commit e6a4c8e5c5
2 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch
+36 -36
View File
@@ -20,10 +20,10 @@ Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
CPP/7zip/Compress/Rar3Decoder.h | 2 ++ CPP/7zip/Compress/Rar3Decoder.h | 2 ++
6 files changed, 42 insertions(+), 8 deletions(-) 6 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp Index: p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp
index 1aaedcc..68030c7 100644 ===================================================================
--- a/CPP/7zip/Compress/Rar1Decoder.cpp --- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp
+++ b/CPP/7zip/Compress/Rar1Decoder.cpp +++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp
@@ -29,7 +29,7 @@ public: @@ -29,7 +29,7 @@ public:
}; };
*/ */
@@ -33,7 +33,7 @@ index 1aaedcc..68030c7 100644
void CDecoder::InitStructures() void CDecoder::InitStructures()
{ {
@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * @@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialIn
InitData(); InitData();
if (!m_IsSolid) if (!m_IsSolid)
{ {
@@ -48,7 +48,7 @@ index 1aaedcc..68030c7 100644
if (m_UnpackSize > 0) if (m_UnpackSize > 0)
{ {
GetFlagsBuf(); GetFlagsBuf();
@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream @@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialI
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
{ {
try { return CodeReal(inStream, outStream, inSize, outSize, progress); } try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
@@ -61,10 +61,10 @@ index 1aaedcc..68030c7 100644
} }
STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h Index: p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h
index 630f089..01b606b 100644 ===================================================================
--- a/CPP/7zip/Compress/Rar1Decoder.h --- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h
+++ b/CPP/7zip/Compress/Rar1Decoder.h +++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h
@@ -39,6 +39,7 @@ public: @@ -39,6 +39,7 @@ public:
Int64 m_UnpackSize; Int64 m_UnpackSize;
@@ -73,11 +73,11 @@ index 630f089..01b606b 100644
UInt32 ReadBits(int numBits); UInt32 ReadBits(int numBits);
HRESULT CopyBlock(UInt32 distance, UInt32 len); HRESULT CopyBlock(UInt32 distance, UInt32 len);
diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp Index: p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp
index b3f2b4b..0580c8d 100644 ===================================================================
--- a/CPP/7zip/Compress/Rar2Decoder.cpp --- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp
+++ b/CPP/7zip/Compress/Rar2Decoder.cpp +++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp
@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; @@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 <<
static const UInt32 kWindowReservSize = (1 << 22) + 256; static const UInt32 kWindowReservSize = (1 << 22) + 256;
CDecoder::CDecoder(): CDecoder::CDecoder():
@@ -87,7 +87,7 @@ index b3f2b4b..0580c8d 100644
{ {
} }
@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB @@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBi
bool CDecoder::ReadTables(void) bool CDecoder::ReadTables(void)
{ {
@@ -105,7 +105,7 @@ index b3f2b4b..0580c8d 100644
return true; return true;
} }
@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * @@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialIn
return S_FALSE; return S_FALSE;
} }
@@ -115,10 +115,10 @@ index b3f2b4b..0580c8d 100644
UInt64 startPos = m_OutWindowStream.GetProcessedSize(); UInt64 startPos = m_OutWindowStream.GetProcessedSize();
while (pos < unPackSize) while (pos < unPackSize)
{ {
diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h Index: p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h
index 3a0535c..0e9005f 100644 ===================================================================
--- a/CPP/7zip/Compress/Rar2Decoder.h --- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h
+++ b/CPP/7zip/Compress/Rar2Decoder.h +++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h
@@ -139,6 +139,7 @@ class CDecoder : @@ -139,6 +139,7 @@ class CDecoder :
UInt64 m_PackSize; UInt64 m_PackSize;
@@ -127,10 +127,10 @@ index 3a0535c..0e9005f 100644
void InitStructures(); void InitStructures();
UInt32 ReadBits(unsigned numBits); UInt32 ReadBits(unsigned numBits);
diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp Index: p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp
index 3bf2513..6cb8a6a 100644 ===================================================================
--- a/CPP/7zip/Compress/Rar3Decoder.cpp --- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp
+++ b/CPP/7zip/Compress/Rar3Decoder.cpp +++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp
@@ -92,7 +92,8 @@ CDecoder::CDecoder(): @@ -92,7 +92,8 @@ CDecoder::CDecoder():
_writtenFileSize(0), _writtenFileSize(0),
_vmData(0), _vmData(0),
@@ -141,7 +141,7 @@ index 3bf2513..6cb8a6a 100644
{ {
Ppmd7_Construct(&_ppmd); Ppmd7_Construct(&_ppmd);
} }
@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) @@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepD
return InitPPM(); return InitPPM();
} }
@@ -151,7 +151,7 @@ index 3bf2513..6cb8a6a 100644
_lzMode = true; _lzMode = true;
PrevAlignBits = 0; PrevAlignBits = 0;
PrevAlignCount = 0; PrevAlignCount = 0;
@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) @@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepD
} }
} }
} }
@@ -161,7 +161,7 @@ index 3bf2513..6cb8a6a 100644
TablesRead = true; TablesRead = true;
// original code has check here: // original code has check here:
@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) @@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepD
RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
memcpy(m_LastLevels, newLevels, kTablesSizesSum); memcpy(m_LastLevels, newLevels, kTablesSizesSum);
@@ -171,7 +171,7 @@ index 3bf2513..6cb8a6a 100644
return S_OK; return S_OK;
} }
@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) @@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProg
PpmEscChar = 2; PpmEscChar = 2;
PpmError = true; PpmError = true;
InitFilters(); InitFilters();
@@ -184,7 +184,7 @@ index 3bf2513..6cb8a6a 100644
if (!m_IsSolid || !TablesRead) if (!m_IsSolid || !TablesRead)
{ {
bool keepDecompressing; bool keepDecompressing;
@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) @@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProg
bool keepDecompressing; bool keepDecompressing;
if (_lzMode) if (_lzMode)
{ {
@@ -193,7 +193,7 @@ index 3bf2513..6cb8a6a 100644
RINOK(DecodeLZ(keepDecompressing)) RINOK(DecodeLZ(keepDecompressing))
} }
else else
@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream @@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialI
_unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
return CodeReal(progress); return CodeReal(progress);
} }
@@ -204,10 +204,10 @@ index 3bf2513..6cb8a6a 100644
// CNewException is possible here. But probably CNewException is caused // CNewException is possible here. But probably CNewException is caused
// by error in data stream. // by error in data stream.
} }
diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h Index: p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h
index c130cec..2f72d7d 100644 ===================================================================
--- a/CPP/7zip/Compress/Rar3Decoder.h --- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h
+++ b/CPP/7zip/Compress/Rar3Decoder.h +++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h
@@ -192,6 +192,7 @@ class CDecoder: @@ -192,6 +192,7 @@ class CDecoder:
UInt32 _lastFilter; UInt32 _lastFilter;
@@ -223,4 +223,4 @@ index c130cec..2f72d7d 100644
+ bool TablesOK; + bool TablesOK;
CPpmd7 _ppmd; CPpmd7 _ppmd;
int PpmEscChar; int PpmEscChar;
meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch
+8 -6
View File
@@ -12,14 +12,16 @@ use unsigned instead of bool
Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
Upstream-Status: Pending Upstream-Status: Pending
--- ./CPP/7zip/Archive/Wim/WimHandler.cpp 2021-05-20 10:51:56.997402701 +0000 Index: p7zip_16.02/CPP/7zip/Archive/Wim/WimHandler.cpp
+++ ./CPP/7zip/Archive/Wim/WimHandler.cpp 2021-05-20 10:52:16.665604125 +0000 ===================================================================
@@ -298,7 +298,7 @@ --- p7zip_16.02.orig/CPP/7zip/Archive/Wim/WimHandler.cpp
+++ p7zip_16.02/CPP/7zip/Archive/Wim/WimHandler.cpp
@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchivePropert
AString res; AString res;
- bool numMethods = 0; - bool numMethods = 0;
+ unsigned numMethods = 0; + unsigned numMethods = 0;
for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++)
{ {
if (methodMask & ((UInt32)1 << i if (methodMask & ((UInt32)1 << i))