diff options
author | 2016-11-18 20:35:18 +1100 | |
---|---|---|
committer | 2016-11-18 20:37:20 +1100 | |
commit | bb99eba11dadfa37acb2a796f4f8e2b0a7330e44 (patch) | |
tree | 4f1f81e691e55d8e7feb47ac5c2dfd8ca0312ce1 /3rdparty/lzma/CPP/7zip/UI/Console/List.cpp | |
parent | ae4b0cdcf26f610687da38c69dd94ceaba593051 (diff) |
Update LZMA to 16.04 (security and portability fixes)
Diffstat (limited to '3rdparty/lzma/CPP/7zip/UI/Console/List.cpp')
-rw-r--r-- | 3rdparty/lzma/CPP/7zip/UI/Console/List.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/3rdparty/lzma/CPP/7zip/UI/Console/List.cpp b/3rdparty/lzma/CPP/7zip/UI/Console/List.cpp index e70f1b67ed2..62e813b2834 100644 --- a/3rdparty/lzma/CPP/7zip/UI/Console/List.cpp +++ b/3rdparty/lzma/CPP/7zip/UI/Console/List.cpp @@ -900,10 +900,10 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const RINOK(PrintArcProp(so, archive, kpidPhySize, NULL)); if (er.TailSize != 0) PrintPropNameAndNumber(so, kpidTailSize, er.TailSize); - UInt32 numProps; - RINOK(archive->GetNumberOfArchiveProperties(&numProps)); - { + UInt32 numProps; + RINOK(archive->GetNumberOfArchiveProperties(&numProps)); + for (UInt32 j = 0; j < numProps; j++) { CMyComBSTR name; @@ -1068,7 +1068,7 @@ HRESULT ListArchives(CCodecs *codecs, g_StdOut << endl << kListing << arcPath << endl << endl; } - HRESULT result = arcLink.Open3(options, &openCallback); + HRESULT result = arcLink.Open_Strict(options, &openCallback); if (result != S_OK) { @@ -1095,9 +1095,6 @@ HRESULT ListArchives(CCodecs *codecs, } { - if (arcLink.NonOpen_ErrorInfo.ErrorFormatIndex >= 0) - numErrors++; - FOR_VECTOR (r, arcLink.Arcs) { const CArcErrorInfo &arc = arcLink.Arcs[r].ErrorInfo; |