Merge branch 'squid-box:dev' into dev

squid-box · Aug 11, 2023 · 6d1a7f0 · 6d1a7f0
2 parents f2fcc00 + 2f30a07
commit 6d1a7f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/SevenZip/ArchiveOpenCallback.cs b/SevenZip/ArchiveOpenCallback.cs
@@ -136,6 +136,7 @@ public int GetStream(string name, out IInStream inStream)
             _volumeFileNames.Add(name);
             if (_wrappers.ContainsKey(name))
             {
+                _wrappers[name].Seek(0, SeekOrigin.Begin, IntPtr.Zero);
                 inStream = _wrappers[name];
             }
             else

diff --git a/SevenZip/SevenZipBase.cs b/SevenZip/SevenZipBase.cs
@@ -210,6 +210,9 @@ internal void CheckedExecute(int hresult, string message, CallbackBase handler)
                             case -2146233086:
                                 exception = new SevenZipException("Argument is out of range. (0x80131502: E_ARGUMENTOUTOFRANGE)");
                                 break;
+                            case -2147024690:
+                                exception = new SevenZipException("Filename or extension is too long. (0x800700CE: ERROR_FILENAME_EXCED_RANGE)");
+                                break;
                             default:
                                 exception = new SevenZipException(
                                     $"Execution has failed due to an internal SevenZipSharp issue (0x{hresult:x} / {hresult}).\n" +

diff --git a/SevenZip/SevenZipExtractor.cs b/SevenZip/SevenZipExtractor.cs
@@ -454,7 +454,7 @@ private IInStream GetArchiveStream(bool dispose)
         /// <returns>OperationResult.Ok if Open() succeeds.</returns>
         private OperationResult OpenArchiveInner(IInStream archiveStream, IArchiveOpenCallback openCallback)
         {
-            ulong checkPos = 1 << 15;
+            ulong checkPos = 1 << 23;
             var res = _archive.Open(archiveStream, ref checkPos, openCallback);
 
             return (OperationResult)res;