Rebase LZMA SDK on 16.04 stable

This was downloaded from http://www.7-zip.org/a/lzma1604.7z
The bin folder was excluded like in previous updates

All files were deleted and replaced with those from the SDK.
The embedded projects Tukaani, xz-embedded and android build
files where not touched.

The changelog since the 9.38 beta is:

16.04          2016-10-04
-------------------------
- The bug was fixed in DllSecur.c.

16.03          2016-09-28
-------------------------
- SFX modules now use some protection against DLL preloading attack.
- Some bugs in 7z code were fixed.

16.02          2016-05-21
-------------------------
- The BUG in 16.00 - 16.01 was fixed:
  Split Handler (SplitHandler.cpp) returned incorrect
  total size value (kpidSize) for split archives.

16.01          2016-05-19
-------------------------
- Some internal changes to reduce the number of compiler warnings.

16.00          2016-05-10
-------------------------
- Some bugs were fixed.

15.12          2015-11-19
-------------------------
- The BUG in C version of 7z decoder was fixed:
  7zDec.c : SzDecodeLzma2()
  7z decoder could mistakenly report about decoding error for some 7z
archives
  that use LZMA2 compression method.
  The probability to get that mistaken decoding error report was about
  one error per 16384 solid blocks for solid blocks larger than 16 KB
(compressed size).
- The BUG (in 9.26-15.11) in C version of 7z decoder was fixed:
  7zArcIn.c : SzReadHeader2()
  7z decoder worked incorrectly for 7z archives that contain
  empty solid blocks, that can be placed to 7z archive, if some file is
  unavailable for reading during archive creation.

15.09 beta     2015-10-16
-------------------------
- The BUG in LZMA / LZMA2 encoding code was fixed.
  The BUG in LzFind.c::MatchFinder_ReadBlock() function.
  If input data size is larger than (4 GiB - dictionary_size),
  the following code worked incorrectly:
  -  LZMA : LzmaEnc_MemEncode(), LzmaEncode() : LZMA encoding functions
     for compressing from memory to memory.
     That BUG is not related to LZMA encoder version that works via
streams.
  -  LZMA2 : multi-threaded version of LZMA2 encoder worked incorrectly,
if
     default value of chunk size (CLzma2EncProps::blockSize) is changed
     to value larger than (4 GiB - dictionary_size).

Change-Id: I6b3974015c605fba3c0d4d897fab5a166174f441

1 files changed, 34 insertions, 5 deletions

diff --git a/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp b/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp
index f268dd9..a9fda7b 100644
--- a/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp
+++ b/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp
@@ -40,12 +40,13 @@ STDMETHODIMP COpenCallbackImp::GetProperty(PROPID propID, PROPVARIANT *value)
   COM_TRY_BEGIN

   NCOM::CPropVariant prop;

   if (_subArchiveMode)

-    switch(propID)

+    switch (propID)

     {

       case kpidName: prop = _subArchiveName; break;

+      // case kpidSize:  prop = _subArchiveSize; break; // we don't use it now

     }

   else

-    switch(propID)

+    switch (propID)

     {

       case kpidName:  prop = _fileInfo.Name; break;

       case kpidIsDir:  prop = _fileInfo.IsDir(); break;

@@ -73,18 +74,40 @@ struct CInFileStreamVol: public CInFileStream
   }

 };

 

+

+// from ArchiveExtractCallback.cpp

+bool IsSafePath(const UString &path);

+

 STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStream)

 {

   COM_TRY_BEGIN

   *inStream = NULL;

+  

   if (_subArchiveMode)

     return S_FALSE;

   if (Callback)

   {

     RINOK(Callback->Open_CheckBreak());

   }

+

+  UString name2 = name;

+

+  

+  #ifndef _SFX

+  

+  #ifdef _WIN32

+  name2.Replace(L'/', WCHAR_PATH_SEPARATOR);

+  #endif

+

+  // if (!allowAbsVolPaths)

+  if (!IsSafePath(name2))

+    return S_FALSE;

+  

+  #endif

+

+

   FString fullPath;

-  if (!NFile::NName::GetFullPath(_folderPrefix, us2fs(name), fullPath))

+  if (!NFile::NName::GetFullPath(_folderPrefix, us2fs(name2), fullPath))

     return S_FALSE;

   if (!_fileInfo.Find(fullPath))

     return S_FALSE;

@@ -93,10 +116,15 @@ STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
   CInFileStreamVol *inFile = new CInFileStreamVol;

   CMyComPtr<IInStream> inStreamTemp = inFile;

   if (!inFile->Open(fullPath))

-    return ::GetLastError();

+  {

+    DWORD lastError = ::GetLastError();

+    if (lastError == 0)

+      return E_FAIL;

+    return HRESULT_FROM_WIN32(lastError);

+  }

 

   FileSizes.Add(_fileInfo.Size);

-  FileNames.Add(name);

+  FileNames.Add(name2);

   inFile->FileNameIndex = FileNames_WasUsed.Add(true);

   inFile->OpenCallbackImp = this;

   inFile->OpenCallbackRef = this;

@@ -119,6 +147,7 @@ STDMETHODIMP COpenCallbackImp::CryptoGetTextPassword(BSTR *password)
   }

   if (!Callback)

     return E_NOTIMPL;

+  PasswordWasAsked = true;

   return Callback->Open_CryptoGetTextPassword(password);

   COM_TRY_END

 }