Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
c6a8cb7d
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
c6a8cb7d
编写于
10月 29, 2014
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] Added missing "ptr = NULL" after some instances of png_free().
上级
7f682636
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
33 addition
and
6 deletion
+33
-6
ANNOUNCE
ANNOUNCE
+3
-2
png.c
png.c
+2
-2
pngpread.c
pngpread.c
+3
-1
pngread.c
pngread.c
+15
-1
pngrutil.c
pngrutil.c
+1
-0
pngwrite.c
pngwrite.c
+9
-0
未找到文件。
ANNOUNCE
浏览文件 @
c6a8cb7d
Libpng 1.6.15beta01 - October 2
7
, 2014
Libpng 1.6.15beta01 - October 2
9
, 2014
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.
...
...
@@ -25,9 +25,10 @@ Other information:
Changes since the last public release (1.6.14):
Version 1.6.15beta01 [October 2
7
, 2014]
Version 1.6.15beta01 [October 2
9
, 2014]
Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x !== 0)"
Simplified png_free_data().
Added missing "ptr = NULL" after some instances of png_free().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
png.c
浏览文件 @
c6a8cb7d
...
...
@@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.15beta01 - October 2
7
, 2014"
PNG_STRING_NEWLINE
\
"libpng version 1.6.15beta01 - October 2
9
, 2014"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2014 Glenn Randers-Pehrson"
PNG_STRING_NEWLINE
\
"Copyright (c) 1996-1997 Andreas Dilger"
PNG_STRING_NEWLINE
\
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
\
PNG_STRING_NEWLINE
;
# else
return
"libpng version 1.6.15beta01 - October 2
7
, 2014\
return
"libpng version 1.6.15beta01 - October 2
9
, 2014\
Copyright (c) 1998-2014 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
;
...
...
pngpread.c
浏览文件 @
c6a8cb7d
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.6.1
4 [October 23, 2014
]
* Last changed in libpng 1.6.1
5 [(PENDING RELEASE)
]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
...
...
@@ -584,11 +584,13 @@ png_push_save_buffer(png_structrp png_ptr)
if
(
png_ptr
->
save_buffer
==
NULL
)
{
png_free
(
png_ptr
,
old_buffer
);
old_buffer
=
NULL
;
png_error
(
png_ptr
,
"Insufficient memory for save_buffer"
);
}
memcpy
(
png_ptr
->
save_buffer
,
old_buffer
,
png_ptr
->
save_buffer_size
);
png_free
(
png_ptr
,
old_buffer
);
old_buffer
=
NULL
;
png_ptr
->
save_buffer_max
=
new_max
;
}
if
(
png_ptr
->
current_buffer_size
)
...
...
pngread.c
浏览文件 @
c6a8cb7d
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.6.1
1 [June 5, 2014
]
* Last changed in libpng 1.6.1
5 [(PENDING RELEASE)
]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
...
...
@@ -922,22 +922,33 @@ png_read_destroy(png_structrp png_ptr)
#endif
png_free
(
png_ptr
,
png_ptr
->
big_row_buf
);
png_ptr
->
big_row_buf
=
NULL
;
png_free
(
png_ptr
,
png_ptr
->
big_prev_row
);
png_ptr
->
big_prev_row
=
NULL
;
png_free
(
png_ptr
,
png_ptr
->
read_buffer
);
png_ptr
->
read_buffer
=
NULL
;
#ifdef PNG_READ_QUANTIZE_SUPPORTED
png_free
(
png_ptr
,
png_ptr
->
palette_lookup
);
png_ptr
->
palette_lookup
=
NULL
;
png_free
(
png_ptr
,
png_ptr
->
quantize_index
);
png_ptr
->
quantize_index
=
NULL
;
#endif
if
(
png_ptr
->
free_me
&
PNG_FREE_PLTE
)
{
png_zfree
(
png_ptr
,
png_ptr
->
palette
);
png_ptr
->
palette
=
NULL
;
}
png_ptr
->
free_me
&=
~
PNG_FREE_PLTE
;
#if defined(PNG_tRNS_SUPPORTED) || \
defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
if
(
png_ptr
->
free_me
&
PNG_FREE_TRNS
)
{
png_free
(
png_ptr
,
png_ptr
->
trans_alpha
);
png_ptr
->
trans_alpha
=
NULL
;
}
png_ptr
->
free_me
&=
~
PNG_FREE_TRNS
;
#endif
...
...
@@ -945,15 +956,18 @@ png_read_destroy(png_structrp png_ptr)
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
png_free
(
png_ptr
,
png_ptr
->
save_buffer
);
png_ptr
->
save_buffer
=
NULL
;
#endif
#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \
defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
png_free
(
png_ptr
,
png_ptr
->
unknown_chunk
.
data
);
png_ptr
->
unknown_chunk
.
data
=
NULL
;
#endif
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
png_free
(
png_ptr
,
png_ptr
->
chunk_list
);
png_ptr
->
chunk_list
=
NULL
;
#endif
/* NOTE: the 'setjmp' buffer may still be allocated and the memory and error
...
...
pngrutil.c
浏览文件 @
c6a8cb7d
...
...
@@ -670,6 +670,7 @@ png_decompress_chunk(png_structrp png_ptr,
* success)
*/
png_free
(
png_ptr
,
text
);
text
=
NULL
;
/* This really is very benign, but it's still an error because
* the extra space may otherwise be used as a Trojan Horse.
...
...
pngwrite.c
浏览文件 @
c6a8cb7d
...
...
@@ -933,12 +933,18 @@ png_write_destroy(png_structrp png_ptr)
/* Free our memory. png_free checks NULL for us. */
png_free_buffer_list
(
png_ptr
,
&
png_ptr
->
zbuffer_list
);
png_free
(
png_ptr
,
png_ptr
->
row_buf
);
png_ptr
->
row_buf
=
NULL
;
#ifdef PNG_WRITE_FILTER_SUPPORTED
png_free
(
png_ptr
,
png_ptr
->
prev_row
);
png_free
(
png_ptr
,
png_ptr
->
sub_row
);
png_free
(
png_ptr
,
png_ptr
->
up_row
);
png_free
(
png_ptr
,
png_ptr
->
avg_row
);
png_free
(
png_ptr
,
png_ptr
->
paeth_row
);
png_ptr
->
prev_row
=
NULL
;
png_ptr
->
sub_row
=
NULL
;
png_ptr
->
up_row
=
NULL
;
png_ptr
->
avg_row
=
NULL
;
png_ptr
->
paeth_row
=
NULL
;
#endif
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
...
...
@@ -946,10 +952,13 @@ png_write_destroy(png_structrp png_ptr)
png_reset_filter_heuristics
(
png_ptr
);
png_free
(
png_ptr
,
png_ptr
->
filter_costs
);
png_free
(
png_ptr
,
png_ptr
->
inv_filter_costs
);
png_ptr
->
filter_costs
=
NULL
;
png_ptr
->
inv_filter_costs
=
NULL
;
#endif
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
png_free
(
png_ptr
,
png_ptr
->
chunk_list
);
png_ptr
->
chunk_list
=
NULL
;
#endif
/* The error handling and memory handling information is left intact at this
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录