Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
edb1f471
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
11 个月 前同步成功
通知
4
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Libpng
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
edb1f471
编写于
10月 01, 2017
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng.
上级
0f9f170e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
19 deletion
+27
-19
ANNOUNCE
ANNOUNCE
+5
-3
CHANGES
CHANGES
+5
-4
contrib/oss-fuzz/Dockerfile
contrib/oss-fuzz/Dockerfile
+4
-3
contrib/oss-fuzz/README.txt
contrib/oss-fuzz/README.txt
+2
-2
contrib/oss-fuzz/build.sh
contrib/oss-fuzz/build.sh
+9
-5
contrib/oss-fuzz/libpng_read_fuzzer.cc
contrib/oss-fuzz/libpng_read_fuzzer.cc
+2
-2
未找到文件。
ANNOUNCE
浏览文件 @
edb1f471
Libpng 1.6.35beta01 -
September 29
, 2017
Libpng 1.6.35beta01 -
October 1
, 2017
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
...
...
@@ -24,8 +24,10 @@ Other information:
Changes since the last public release (1.6.34):
Version 1.6.35beta01 [September 29, 2017]
Restored 21 of the contrib/pngsuite/i*.png, which were correct.
Version 1.6.35beta01 [October 1, 2017]
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CHANGES
浏览文件 @
edb1f471
...
...
@@ -6038,11 +6038,12 @@ Version 1.6.33 [September 28, 2017]
Add end_info structure and png_read_end() to the libpng fuzzer.
Version 1.6.34 [September 29, 2017]
Removed contrib/pngsuite/i*.png; some of these were incorrect and caused
test failures.
Removed contrib/pngsuite/i*.png; some of caused test failures.
Version 1.6.35beta01 [September 29, 2017]
Restored 21 of the contrib/pngsuite/i*.png, which were correct.
Version 1.6.35beta01 [October 1, 2017]
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
contrib/oss-fuzz/Dockerfile
浏览文件 @
edb1f471
...
...
@@ -16,9 +16,10 @@
FROM
gcr.io/oss-fuzz-base/base-builder
MAINTAINER
glennrp@gmail.com
RUN
apt-get update
&&
apt-get
install
-y
make autoconf automake libtool zlib1g-dev
RUN
apt-get update
&&
\
apt-get
install
-y
make autoconf automake libtool
RUN
git clone
--depth
1 https://github.com/madler/zlib.git
RUN
git clone
--depth
1 https://github.com/glennrp/libpng.git
RUN
(
cd
libpng
;
git log |
head
-1
)
RUN
cp
libpng/contrib/oss-fuzz/build.sh
$SRC
WORKDIR
libpng
COPY
build.sh $SRC/
contrib/oss-fuzz/README.txt
浏览文件 @
edb1f471
...
...
@@ -24,13 +24,13 @@ The files are
Filename or derived Copyright License
========================= ========== ================ ==========
Dockerfile* derived 2017, Glenn R-P Apache 2.0
build.sh
*
derived 2017, Glenn R-P Apache 2.0
build.sh
derived 2017, Glenn R-P Apache 2.0
libpng_read_fuzzer.cc derived 2017, Glenn R-P Chromium
libpng_read_fuzzer.options original 2015, Chrome Devs Chromium
png.dict original 2015, Chrome Devs Chromium
README.txt (this file) original 2017, Glenn R-P libpng
* Dockerfile
and build.sh are copies of the files used by oss-fuzz.
* Dockerfile
is a copy of the file used by oss-fuzz. build.sh,
png.dict and libpng_read_fuzzer.* are the actual files used by oss-fuzz,
which retrieves them from the libpng repository at Github.
...
...
contrib/oss-fuzz/build.sh
浏览文件 @
edb1f471
...
...
@@ -14,12 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Last changed in libpng 1.6.3
3 [September 28
, 2017]
# Last changed in libpng 1.6.3
5 [October 1
, 2017]
#
# Revisions by Glenn Randers-Pehson, 2017:
# Revisions by Glenn Randers-Peh
r
son, 2017:
# 1. Build only the library, not the tools (changed "make -j$(nproc) all" to
# "make -j$(nproc) libpng16.la").
# 2. Disabled WARNING and WRITE options in pnglibconf.dfa.
# 3. Build zlib alongside libpng
################################################################################
# Disable logging via library build configuration control.
...
...
@@ -30,14 +31,17 @@ cat scripts/pnglibconf.dfa | \
>
scripts/pnglibconf.dfa.temp
mv
scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa
# build the library.
# build zlib library.
(
cd
../zlib
;
./configure
;
make
-j
$(
nproc
)
clean
;
make
-j
$(
nproc
)
all
)
# build the libpng library.
autoreconf
-f
-i
./configure
CPPFLAGS
=
"-I../zlib"
LDFLAGS
=
"-L../zlib"
./configure
make
-j
$(
nproc
)
clean
make
-j
$(
nproc
)
libpng16.la
# build libpng_read_fuzzer.
$CXX
$CXXFLAGS
-std
=
c++11
-I
.
\
$CXX
$CXXFLAGS
-std
=
c++11
-I
.
-I
../zlib
-L
../zlib
\
$SRC
/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc
\
-o
$OUT
/libpng_read_fuzzer
\
-lFuzzingEngine
.libs/libpng16.a
-lz
...
...
contrib/oss-fuzz/libpng_read_fuzzer.cc
浏览文件 @
edb1f471
...
...
@@ -5,7 +5,7 @@
// Use of this source code is governed by a BSD-style license that may
// be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE
// Last changed in libpng 1.6.3
2 [August 24
, 2017]
// Last changed in libpng 1.6.3
4 [September 27
, 2017]
// The modifications in 2017 by Glenn Randers-Pehrson include
// 1. addition of a PNG_CLEANUP macro,
...
...
@@ -138,7 +138,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
png_read_info
(
png_handler
.
png_ptr
,
png_handler
.
info_ptr
);
png_handler
.
row_ptr
=
png_malloc
(
png_handler
.
png_ptr
,
png_get_rowbytes
(
png_handler
.
png_ptr
,
png_handler
.
info_ptr
));
png_handler
.
info_ptr
));
// reset error handler to put png_deleter into scope.
if
(
setjmp
(
png_jmpbuf
(
png_handler
.
png_ptr
)))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录