pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

return error from abnormal zip (#237)

Browse Source
This commit is contained in:
Elena Subbotina
2020-04-02 11:46:00 +03:00
committed by GitHub
parent 1b6eff5cb7
commit fd6beb0044
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OfficeUtils/src/ZipUtilsCP.cpp
View File

@ -448,7 +448,10 @@ namespace ZLibZipUtils
if (do_extract_currentfile(uf,&opt_extract_without_path,
&opt_overwrite,
password) != UNZ_OK)
break;
{
err = -1;
break;
}
if ( progress != NULL )
{
@ -481,7 +484,7 @@ namespace ZLibZipUtils
(*progress)( UTILS_ONPROGRESSEVENT_ID, progressValue, &cancel );
}
return 0;
return err;
}
/*========================================================================================================*/
@ -841,9 +844,9 @@ int ZipDir( const WCHAR* dir, const WCHAR* outputFile, const OnProgressCallback*
if ( buffer != NULL )
{
#if defined(_WIN32) || defined (_WIN64)
err = _wchdir( buffer );
int err1 = _wchdir( buffer );
#else
err = chdir( buffer );
int err1 = chdir( buffer );
#endif
free( buffer );

9
X2tConverter/src/ASCConverters.cpp
View File

@ -147,9 +147,7 @@ namespace NExtractTools
if (OfficeFileFormatChecker.nFileType == AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO)
return mscrypt2oot_bin(sFrom, sTo, sTemp, params);
else
{
//вместо docx другой формат!!
}
return AVS_FILEUTILS_ERROR_CONVERT;
}
else return AVS_FILEUTILS_ERROR_CONVERT;
}
@ -559,7 +557,7 @@ namespace NExtractTools
}
else
{
//вместо xlsx другой формат!!
return AVS_FILEUTILS_ERROR_CONVERT;
}
}
else return AVS_FILEUTILS_ERROR_CONVERT;
@ -938,7 +936,8 @@ namespace NExtractTools
{
if (OfficeFileFormatChecker.nFileType == AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO)
return mscrypt2oot_bin(sFrom, sTo, sTemp, params);
//вместо pptx другой формат!!
else
return AVS_FILEUTILS_ERROR_CONVERT;
}
else return AVS_FILEUTILS_ERROR_CONVERT;
}