pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1234 from ONLYOFFICE/hotfix/v7.4.1

Browse Source 
Fix NormalizePath method
This commit is contained in:
Oleg Korshul
2023-07-17 22:19:09 +05:00
committed by GitHub
parent efa6115a34 f1b4b2ac29
commit d0afc0fdc0
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
View File

@ -367,11 +367,11 @@ public:
if (curRel.target_mode == L"Internal" && !CSignFolderFiles::CheckNeedSign(curRel.target))
continue;
std::wstring sFullPath = oInfo.GetHeadPath(curRel.target);
// если внутренний файл отсутствует - не валидная подпись
if (curRel.target_mode == L"Internal")
{
std::wstring sFullPath = oInfo.GetHeadPath(curRel.target);
if (!m_pFolder->exists(sFullPath))
m_valid = OOXML_SIGNATURE_INVALID;
else

2
DesktopEditor/xmlsec/src/src/XmlRels.h
View File

@ -40,7 +40,7 @@ public:
std::wstring GetHeadPath(const std::wstring& sFile)
{
std::wstring sFullPath = m_sAliasDirectory + L"/" + sFile;
NSSystemPath::NormalizePath(sFullPath);
sFullPath = NSSystemPath::NormalizePath(sFullPath);
if (!sFullPath.empty() && '/' != sFullPath[0])
sFullPath = L"/" + sFullPath;