Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
0ab73e59
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
11 个月 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0ab73e59
编写于
2月 20, 2018
作者:
G
Garret Rieger
提交者:
Behdad Esfahbod
2月 20, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[subset] Sanity check that loca writes are inbounds.
上级
73e20ec6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
14 deletion
+41
-14
src/hb-subset-glyf.cc
src/hb-subset-glyf.cc
+41
-14
未找到文件。
src/hb-subset-glyf.cc
浏览文件 @
0ab73e59
...
...
@@ -62,15 +62,34 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
return
true
;
}
static
void
_write_loca_entry
(
unsigned
int
id
,
unsigned
int
offset
,
bool
is_short
,
void
*
loca_prime
)
{
if
(
is_short
)
{
((
OT
::
HBUINT16
*
)
loca_prime
)
[
id
].
set
(
offset
/
2
);
}
else
{
((
OT
::
HBUINT32
*
)
loca_prime
)
[
id
].
set
(
offset
);
static
bool
_write_loca_entry
(
unsigned
int
id
,
unsigned
int
offset
,
bool
is_short
,
void
*
loca_prime
,
unsigned
int
loca_size
)
{
unsigned
int
entry_size
=
is_short
?
sizeof
(
OT
::
HBUINT16
)
:
sizeof
(
OT
::
HBUINT32
);
if
((
id
+
1
)
*
entry_size
<=
loca_size
)
{
if
(
is_short
)
{
((
OT
::
HBUINT16
*
)
loca_prime
)
[
id
].
set
(
offset
/
2
);
}
else
{
((
OT
::
HBUINT32
*
)
loca_prime
)
[
id
].
set
(
offset
);
}
return
true
;
}
// Offset was not written because the write is out of bounds.
DEBUG_MSG
(
SUBSET
,
nullptr
,
"WARNING: Attempted to write an out of bounds loca entry at index %d. Loca size is %d."
,
id
,
loca_size
);
return
false
;
}
static
void
_update_components
(
hb_subset_plan_t
*
plan
,
char
*
glyph_start
,
...
...
@@ -100,14 +119,16 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
const
OT
::
glyf
::
accelerator_t
&
glyf
,
const
char
*
glyf_data
,
bool
use_short_loca
,
int
glyf_prime_size
,
unsigned
int
glyf_prime_size
,
char
*
glyf_prime_data
/* OUT */
,
int
loca_prime_size
,
unsigned
int
loca_prime_size
,
char
*
loca_prime_data
/* OUT */
)
{
// TODO(grieger): Sanity check writes to make sure they are in-bounds.
hb_prealloced_array_t
<
hb_codepoint_t
>
&
glyph_ids
=
plan
->
gids_to_retain_sorted
;
char
*
glyf_prime_data_next
=
glyf_prime_data
;
bool
success
=
true
;
for
(
unsigned
int
i
=
0
;
i
<
glyph_ids
.
len
;
i
++
)
{
unsigned
int
start_offset
,
end_offset
;
...
...
@@ -117,15 +138,22 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
int
length
=
end_offset
-
start_offset
;
memcpy
(
glyf_prime_data_next
,
glyf_data
+
start_offset
,
length
);
_write_loca_entry
(
i
,
glyf_prime_data_next
-
glyf_prime_data
,
use_short_loca
,
loca_prime_data
);
success
=
success
&&
_write_loca_entry
(
i
,
glyf_prime_data_next
-
glyf_prime_data
,
use_short_loca
,
loca_prime_data
,
loca_prime_size
);
_update_components
(
plan
,
glyf_prime_data_next
,
end_offset
-
start_offset
);
glyf_prime_data_next
+=
length
;
}
_write_loca_entry
(
glyph_ids
.
len
,
glyf_prime_data_next
-
glyf_prime_data
,
use_short_loca
,
loca_prime_data
);
return
true
;
success
=
success
&&
_write_loca_entry
(
glyph_ids
.
len
,
glyf_prime_data_next
-
glyf_prime_data
,
use_short_loca
,
loca_prime_data
,
loca_prime_size
);
return
success
;
}
static
bool
...
...
@@ -136,9 +164,7 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
hb_blob_t
**
glyf_prime
/* OUT */
,
hb_blob_t
**
loca_prime
/* OUT */
)
{
// TODO(grieger): Sanity check writes to make sure they are in-bounds.
// TODO(grieger): Sanity check allocation size for the new table.
// TODO(grieger): Don't fail on bad offsets, just dump them.
hb_prealloced_array_t
<
hb_codepoint_t
>
&
glyphs_to_retain
=
plan
->
gids_to_retain_sorted
;
unsigned
int
glyf_prime_size
;
...
...
@@ -159,6 +185,7 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
glyf_prime_size
,
glyf_prime_data
,
loca_prime_size
,
loca_prime_data
)))
{
free
(
glyf_prime_data
);
free
(
loca_prime_data
);
return
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录