Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
a2fe24d1
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
a2fe24d1
编写于
11月 05, 2014
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] Simplified and future-proofed png_user_version_check().
上级
97dd654b
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
11 addition
and
13 deletion
+11
-13
ANNOUNCE
ANNOUNCE
+1
-0
CHANGES
CHANGES
+1
-0
png.c
png.c
+9
-13
未找到文件。
ANNOUNCE
浏览文件 @
a2fe24d1
...
...
@@ -44,6 +44,7 @@ Version 1.6.15beta05 [November 5, 2014]
Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
example.c, pngtest.c, and applications in the contrib directory.
Avoid out-of-bounds memory access in png_user_version_check().
Simplified and future-proofed png_user_version_check().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CHANGES
浏览文件 @
a2fe24d1
...
...
@@ -5052,6 +5052,7 @@ Version 1.6.15beta05 [November 5, 2014]
Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
example.c, pngtest.c, and applications in the contrib directory.
Avoid out-of-bounds memory access in png_user_version_check().
Simplified and future-proofed png_user_version_check().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
png.c
浏览文件 @
a2fe24d1
...
...
@@ -165,16 +165,24 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
int
png_user_version_check
(
png_structrp
png_ptr
,
png_const_charp
user_png_ver
)
{
/* Libpng versions 1.0.0 and later are binary compatible if the version
* string matches through the second '.'; we must recompile any
* applications that use any older library version.
*/
if
(
user_png_ver
!=
NULL
)
{
int
i
=
-
1
;
int
found_dots
=
0
;
do
{
i
++
;
if
(
user_png_ver
[
i
]
!=
png_libpng_ver
[
i
])
png_ptr
->
flags
|=
PNG_FLAG_LIBRARY_MISMATCH
;
}
while
(
png_libpng_ver
[
i
]
!=
0
&&
user_png_ver
[
i
]
!=
0
);
if
(
user_png_ver
[
i
]
==
'.'
)
found_dots
++
;
}
while
(
found_dots
<
2
&&
png_libpng_ver
[
i
]
!=
0
&&
user_png_ver
[
i
]
!=
0
);
}
else
...
...
@@ -182,17 +190,6 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
if
((
png_ptr
->
flags
&
PNG_FLAG_LIBRARY_MISMATCH
)
!=
0
)
{
/* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
* we must recompile any applications that use any older library version.
* For versions after libpng 1.0, we will be compatible, so we need
* only check the first and third digits (note that when we reach version
* 1.10 we will need to check the fourth symbol, namely user_png_ver[3]).
*/
if
(
user_png_ver
==
NULL
||
user_png_ver
[
0
]
!=
png_libpng_ver
[
0
]
||
(
user_png_ver
[
0
]
==
'1'
&&
(
user_png_ver
[
2
]
!=
png_libpng_ver
[
2
]
||
user_png_ver
[
3
]
!=
png_libpng_ver
[
3
]))
||
(
user_png_ver
[
0
]
==
'0'
&&
user_png_ver
[
2
]
<
'9'
))
{
#ifdef PNG_WARNINGS_SUPPORTED
size_t
pos
=
0
;
char
m
[
128
];
...
...
@@ -213,7 +210,6 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
return
0
;
}
}
/* Success return. */
return
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录