Skip to content

Commit

Permalink
Merge pull request #15 from szcnick/dev
Browse files Browse the repository at this point in the history
release VERSION 17.01
  • Loading branch information
jinfeihan57 committed May 13, 2020
2 parents 2cd76ff + 036f733 commit 484ee17
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 10 deletions.
6 changes: 3 additions & 3 deletions C/7zVersion.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#define MY_VER_MAJOR 16
#define MY_VER_MINOR 02
#define MY_VER_BUILD 0
#define MY_VERSION_NUMBERS "17.00"
#define MY_VERSION "17.00"
#define MY_VERSION_NUMBERS "17.01"
#define MY_VERSION "17.01"
#define MY_DATE "2020-04-20"
#undef MY_COPYRIGHT
#undef MY_VERSION_COPYRIGHT_DATE
Expand All @@ -18,5 +18,5 @@

#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " : " MY_COPYRIGHT " : " MY_DATE

#define P7ZIP_VERSION "17.00"
#define P7ZIP_VERSION "17.01"

6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 17.01
=============

- Fix BUG CVE-2018-5996
- Fix BUG CVE-2017-17969
- Fix BUG CVE-2016-9296

Version 17.00
=============
Expand Down
2 changes: 1 addition & 1 deletion DOC/MANUAL/start.htm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<H1>7-Zip</H1>

<P><B>Welcome to 7-Zip 17.00</B></P>
<P><B>Welcome to 7-Zip 17.01</B></P>
<P>7-Zip is a file archiver with a high compression ratio.</P>

<H4>The documentation for 7-Zip includes:</H4>
Expand Down
2 changes: 1 addition & 1 deletion DOC/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</tr>
<tr>
<td rowspan="5">根据 7zip 版本对 p7zip进行版本对齐维护</td>
<td style="table-layout:fixed" width="200" >17.00:新增NewHandler.h / NewHandler.cpp重新定义了new(),针对老版本的_MSC_VER < 1900,修改了C/7zTypes.h中变量名,一些造成崩溃的BUG修复</td>
<td style="table-layout:fixed" width="200" >17.01:新增NewHandler.h / NewHandler.cpp重新定义了new(),针对老版本的_MSC_VER < 1900,修改了C/7zTypes.h中变量名,一些造成崩溃的BUG修复</td>
<td rowspan="5">根据紧迫度和难度分步迭代优化</td>
<td>计划中</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion DOC/readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
7-Zip 17.00 Sources
7-Zip 17.01 Sources
-------------------

7-Zip is a file archiver for Windows.
Expand Down
8 changes: 8 additions & 0 deletions DOC/src-history.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
HISTORY of the 7-Zip source code

--------------------------------
17.01 2020-05-13
-------------------------
- Fix BUG CVE-2018-5996
- Fix BUG CVE-2017-17969
- Fix BUG CVE-2016-9296

--------------------------------
17.00 2020-04-27
-------------------------
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
p7zip 17.00
p7zip 17.01
===========

Homepage : https://github.com/szcnick/p7zip
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ We use [silesia](http://sun.aei.polsl.pl/~sdeor/index.php?page=silesia) files(to

The output should look like this:
```
7-Zip (a) [64] 17.00 : Copyright (c) 1999-2016 Igor Pavlov
p7zip Version 17.00 (locale=zh_CN.UTF-8,Utf16=on,HugeFiles=on,64 bits,12 CPUs x64)
7-Zip (a) [64] 17.01 : Copyright (c) 1999-2016 Igor Pavlov
p7zip Version 17.01 (locale=zh_CN.UTF-8,Utf16=on,HugeFiles=on,64 bits,12 CPUs x64)
Formats:
...
Expand Down Expand Up @@ -111,7 +111,7 @@ Hashers:

## Version Information

- 7-Zip ZS Version 17.00
- p7zip Version 17.01
- [LZ4] Version 1.9.2
- [Zstandard] Version 1.4.4

Expand Down

0 comments on commit 484ee17

Please sign in to comment.