Fix crash when comparing Alternate Data Streams like file.zip:Zone.Identifier:$DATA...

diff --git a/Externals/poco/Foundation/src/File_WIN32U.cpp b/Externals/poco/Foundation/src/File_WIN32U.cpp
index c48ae06..3df4990 100644 (file)
--- a/Externals/poco/Foundation/src/File_WIN32U.cpp
+++ b/Externals/poco/Foundation/src/File_WIN32U.cpp
@@ -298,7 +298,22 @@ void FileImpl::copyToImpl(const std::string& path, int options) const
        std::wstring upath;
        convertPath(path, upath);
        if (CopyFileW(_upath.c_str(), upath.c_str(), (options & OPT_FAIL_ON_OVERWRITE_IMPL) != 0) == 0)
-               handleLastErrorImpl(_path);
+       {
+               // CopyFileW() function cannot copy Alternate Data Streams
+               FileHandle fhIn(_path, _upath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_EXISTING);
+               FileHandle fhOut(path, upath, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 
+                       ((options & OPT_FAIL_ON_OVERWRITE_IMPL) != 0) ? CREATE_NEW : OPEN_ALWAYS);
+               char buf[65536];
+               DWORD dwRead = sizeof(buf), dwWritten = 0;
+               while (dwRead == sizeof(buf))
+               {
+                       if (!ReadFile(fhIn.get(), buf, sizeof(buf), &dwRead, nullptr))
+                               handleLastErrorImpl(_path);
+                       if (!WriteFile(fhOut.get(), buf, dwRead, &dwWritten, nullptr))
+                               handleLastErrorImpl(_path);
+               }
+               SetEndOfFile(fhOut.get());
+       }
 }
 
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index fc723b3..cb11eca 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2833,7 +2833,15 @@ bool CMainFrame::DoSelfCompare(UINT nID, const String& file, const String strDes
        else
        {
                copiedFile = wTemp->Create(_T("self-compare_"), ext);
-               TFile(file).copyTo(copiedFile);
+               try
+               {
+                       TFile(file).copyTo(copiedFile);
+               }
+               catch (Poco::FileException& e)
+               {
+                       
+                       LogErrorStringUTF8(e.displayText());
+               }
        }
        m_tempFiles.push_back(wTemp);
 

diff --git a/Src/TFile.h b/Src/TFile.h
index a33b9dd..b20b096 100644 (file)
--- a/Src/TFile.h
+++ b/Src/TFile.h
@@ -2,6 +2,7 @@
 
 #define POCO_NO_UNWINDOWS 1
 #include <Poco/File.h>
+#include <Poco/Exception.h>
 #include "UnicodeString.h"
 #include "unicoder.h"